From c5e95bccc938b59fbfe35e4c490c6c7a6efc91f3 Mon Sep 17 00:00:00 2001 From: Bhaskar Mallapragada Date: Thu, 24 Oct 2019 10:39:31 -0700 Subject: [PATCH 1/4] Changing packages from com.azure.data.cosmos -> com.azure.cosmos --- sdk/cosmos/README.md | 2 +- sdk/cosmos/azure-cosmos-benchmark/pom.xml | 4 +- .../cosmos/benchmark/AsyncBenchmark.java | 27 +++-- .../cosmos/benchmark/AsyncMixedBenchmark.java | 16 +-- .../cosmos/benchmark/AsyncQueryBenchmark.java | 10 +- .../AsyncQuerySinglePartitionMultiple.java | 10 +- .../cosmos/benchmark/AsyncReadBenchmark.java | 10 +- .../cosmos/benchmark/AsyncWriteBenchmark.java | 8 +- .../cosmos/benchmark/Configuration.java | 10 +- .../cosmos/benchmark/DocDBUtils.java | 18 ++-- .../{data => }/cosmos/benchmark/Main.java | 2 +- .../cosmos/benchmark/ReadMyWriteWorkflow.java | 26 ++--- .../src/main/resources/log4j.properties | 4 +- .../cosmos/benchmark/QueryBuilderTest.java | 4 +- .../ReadMyWritesConsistencyTest.java | 26 ++--- .../{data => }/cosmos/benchmark/Utils.java | 24 ++--- .../cosmos/benchmark/WorkflowTest.java | 26 ++--- sdk/cosmos/azure-cosmos-examples/pom.xml | 4 +- .../cosmos/examples/AccountSettings.java | 2 +- .../{data => }/cosmos/examples/BasicDemo.java | 24 ++--- .../ChangeFeed/SampleChangeFeedProcessor.java | 18 +++- .../ChangeFeed/SampleConfigurations.java | 2 +- .../cosmos/examples/HelloWorldDemo.java | 5 +- .../multimaster/ConfigurationManager.java | 2 +- .../rx/examples/multimaster/Helpers.java | 12 +-- .../multimaster/samples/ConflictWorker.java | 34 +++---- .../rx/examples/multimaster/samples/Main.java | 4 +- .../samples/MultiMasterScenario.java | 10 +- .../examples/multimaster/samples/Worker.java | 12 +-- .../src/main/resources/log4j.properties | 12 +-- .../{data => }/cosmos/DocumentClientTest.java | 4 +- .../examples/CollectionCRUDAsyncAPITest.java | 40 ++++---- .../cosmos/rx/examples/ConflictAPITest.java | 30 +++--- .../rx/examples/DatabaseCRUDAsyncAPITest.java | 22 ++--- .../rx/examples/DocumentCRUDAsyncAPITest.java | 37 +++---- .../examples/DocumentQueryAsyncAPITest.java | 36 +++---- .../rx/examples/InMemoryGroupbyTest.java | 30 +++--- .../rx/examples/OfferCRUDAsyncAPITest.java | 34 +++---- .../examples/StoredProcedureAsyncAPITest.java | 38 +++---- .../rx/examples/TestConfigurations.java | 2 +- .../cosmos/rx/examples/TokenResolverTest.java | 38 +++---- .../rx/examples/UniqueIndexAsyncAPITest.java | 30 +++--- .../{data => }/cosmos/rx/examples/Utils.java | 26 ++--- .../{data => }/cosmos/AccessCondition.java | 2 +- .../cosmos/AccessConditionType.java | 2 +- .../cosmos/BadRequestException.java | 14 ++- .../{data => }/cosmos/BridgeInternal.java | 54 ++++++---- .../{data => }/cosmos/ChangeFeedOptions.java | 5 +- .../cosmos/ChangeFeedProcessor.java | 8 +- .../cosmos/ChangeFeedProcessorOptions.java | 2 +- .../cosmos/ClientSideRequestStatistics.java | 19 ++-- .../cosmos/CommonsBridgeInternal.java | 2 +- .../{data => }/cosmos/CompositePath.java | 5 +- .../cosmos/CompositePathSortOrder.java | 2 +- .../{data => }/cosmos/ConflictException.java | 16 +-- .../cosmos/ConflictResolutionMode.java | 8 +- .../cosmos/ConflictResolutionPolicy.java | 14 ++- .../{data => }/cosmos/ConnectionMode.java | 2 +- .../{data => }/cosmos/ConnectionPolicy.java | 2 +- .../{data => }/cosmos/ConsistencyLevel.java | 2 +- .../{data => }/cosmos/ConsistencyPolicy.java | 5 +- .../{data => }/cosmos/CosmosAsyncClient.java | 20 ++-- .../cosmos/CosmosAsyncConflict.java | 10 +- .../cosmos/CosmosAsyncConflictResponse.java | 8 +- .../cosmos/CosmosAsyncContainer.java | 18 ++-- .../cosmos/CosmosAsyncContainerResponse.java | 8 +- .../cosmos/CosmosAsyncDatabase.java | 18 ++-- .../cosmos/CosmosAsyncDatabaseResponse.java | 8 +- .../{data => }/cosmos/CosmosAsyncItem.java | 11 ++- .../cosmos/CosmosAsyncItemResponse.java | 8 +- .../cosmos/CosmosAsyncPermission.java | 8 +- .../cosmos/CosmosAsyncPermissionResponse.java | 8 +- .../{data => }/cosmos/CosmosAsyncScripts.java | 11 ++- .../cosmos/CosmosAsyncStoredProcedure.java | 8 +- .../CosmosAsyncStoredProcedureResponse.java | 11 ++- .../{data => }/cosmos/CosmosAsyncTrigger.java | 8 +- .../cosmos/CosmosAsyncTriggerResponse.java | 8 +- .../{data => }/cosmos/CosmosAsyncUser.java | 8 +- .../CosmosAsyncUserDefinedFunction.java | 8 +- ...osmosAsyncUserDefinedFunctionResponse.java | 8 +- .../cosmos/CosmosAsyncUserResponse.java | 8 +- .../cosmos/CosmosBridgeInternal.java | 8 +- .../azure/{data => }/cosmos/CosmosClient.java | 2 +- .../cosmos/CosmosClientBuilder.java | 8 +- .../cosmos/CosmosClientException.java | 8 +- .../cosmos/CosmosConflictProperties.java | 11 ++- .../cosmos/CosmosConflictRequestOptions.java | 5 +- .../{data => }/cosmos/CosmosContainer.java | 2 +- .../cosmos/CosmosContainerProperties.java | 13 ++- .../cosmos/CosmosContainerRequestOptions.java | 5 +- .../cosmos/CosmosContainerResponse.java | 2 +- .../{data => }/cosmos/CosmosDatabase.java | 2 +- .../cosmos/CosmosDatabaseProperties.java | 8 +- .../cosmos/CosmosDatabaseRequestOptions.java | 5 +- .../cosmos/CosmosDatabaseResponse.java | 2 +- .../azure/{data => }/cosmos/CosmosError.java | 5 +- .../azure/{data => }/cosmos/CosmosItem.java | 2 +- .../cosmos/CosmosItemProperties.java | 8 +- .../cosmos/CosmosItemRequestOptions.java | 5 +- .../{data => }/cosmos/CosmosItemResponse.java | 2 +- .../cosmos/CosmosKeyCredential.java | 2 +- .../cosmos/CosmosPermissionProperties.java | 8 +- .../CosmosPermissionRequestOptions.java | 5 +- .../{data => }/cosmos/CosmosResourceType.java | 2 +- .../{data => }/cosmos/CosmosResponse.java | 6 +- .../cosmos/CosmosResponseDiagnostics.java | 2 +- .../{data => }/cosmos/CosmosScripts.java | 2 +- .../cosmos/CosmosStoredProcedure.java | 2 +- .../CosmosStoredProcedureProperties.java | 11 ++- .../CosmosStoredProcedureRequestOptions.java | 5 +- .../cosmos/CosmosStoredProcedureResponse.java | 2 +- .../{data => }/cosmos/CosmosTrigger.java | 2 +- .../cosmos/CosmosTriggerProperties.java | 11 ++- .../cosmos/CosmosTriggerResponse.java | 2 +- .../azure/{data => }/cosmos/CosmosUser.java | 2 +- .../cosmos/CosmosUserDefinedFunction.java | 2 +- .../CosmosUserDefinedFunctionProperties.java | 11 ++- .../CosmosUserDefinedFunctionResponse.java | 2 +- .../cosmos/CosmosUserProperties.java | 11 ++- .../{data => }/cosmos/CosmosUserResponse.java | 2 +- .../com/azure/{data => }/cosmos/DataType.java | 2 +- .../{data => }/cosmos/DatabaseAccount.java | 37 +++---- .../cosmos/DatabaseAccountLocation.java | 9 +- .../azure/{data => }/cosmos/ExcludedPath.java | 5 +- .../azure/{data => }/cosmos/FeedOptions.java | 2 +- .../azure/{data => }/cosmos/FeedResponse.java | 16 +-- .../cosmos/FeedResponseDiagnostics.java | 5 +- .../{data => }/cosmos/ForbiddenException.java | 16 +-- .../{data => }/cosmos/GoneException.java | 19 ++-- .../azure/{data => }/cosmos/HashIndex.java | 5 +- .../azure/{data => }/cosmos/IncludedPath.java | 5 +- .../com/azure/{data => }/cosmos/Index.java | 5 +- .../azure/{data => }/cosmos/IndexKind.java | 2 +- .../{data => }/cosmos/IndexingDirective.java | 2 +- .../azure/{data => }/cosmos/IndexingMode.java | 2 +- .../{data => }/cosmos/IndexingPolicy.java | 5 +- .../cosmos/InternalServerErrorException.java | 14 ++- .../cosmos/InvalidPartitionException.java | 17 ++-- .../{data => }/cosmos/JsonSerializable.java | 8 +- .../{data => }/cosmos/LockedException.java | 16 +-- .../cosmos/MethodNotAllowedException.java | 10 +- .../{data => }/cosmos/NotFoundException.java | 16 +-- .../cosmos/PartitionIsMigratingException.java | 17 ++-- .../azure/{data => }/cosmos/PartitionKey.java | 6 +- .../cosmos/PartitionKeyDefinition.java | 13 ++- .../cosmos/PartitionKeyDefinitionVersion.java | 2 +- .../PartitionKeyRangeGoneException.java | 12 +-- ...PartitionKeyRangeIsSplittingException.java | 17 ++-- .../{data => }/cosmos/PartitionKind.java | 2 +- .../{data => }/cosmos/PermissionMode.java | 2 +- .../cosmos/PreconditionFailedException.java | 16 +-- .../azure/{data => }/cosmos/RangeIndex.java | 5 +- .../RequestEntityTooLargeException.java | 16 +-- .../cosmos/RequestRateTooLargeException.java | 16 +-- .../cosmos/RequestTimeoutException.java | 17 ++-- .../com/azure/{data => }/cosmos/Resource.java | 5 +- .../azure/{data => }/cosmos/RetryOptions.java | 2 +- .../{data => }/cosmos/RetryWithException.java | 13 ++- .../cosmos/SerializationFormattingPolicy.java | 2 +- .../cosmos/ServiceUnavailableException.java | 10 +- .../azure/{data => }/cosmos/SpatialIndex.java | 5 +- .../azure/{data => }/cosmos/SpatialSpec.java | 4 +- .../azure/{data => }/cosmos/SpatialType.java | 2 +- .../azure/{data => }/cosmos/SqlParameter.java | 2 +- .../{data => }/cosmos/SqlParameterList.java | 2 +- .../azure/{data => }/cosmos/SqlQuerySpec.java | 2 +- .../{data => }/cosmos/TokenResolver.java | 2 +- .../{data => }/cosmos/TriggerOperation.java | 2 +- .../azure/{data => }/cosmos/TriggerType.java | 2 +- .../cosmos/UnauthorizedException.java | 16 +-- .../azure/{data => }/cosmos/UniqueKey.java | 5 +- .../{data => }/cosmos/UniqueKeyPolicy.java | 5 +- .../cosmos/internal/AsyncDocumentClient.java | 22 ++--- .../internal/AuthorizationTokenProvider.java | 2 +- .../internal/AuthorizationTokenType.java | 2 +- .../cosmos/internal/BackoffRetryUtility.java | 2 +- .../BaseAuthorizationTokenProvider.java | 7 +- ...eDatabaseAccountConfigurationProvider.java | 8 +- .../{data => }/cosmos/internal/Bytes.java | 2 +- .../cosmos/internal/ChangeFeedQueryImpl.java | 23 +++-- ...ringSessionContainerClientRetryPolicy.java | 4 +- .../cosmos/internal/ClientRetryPolicy.java | 15 +-- .../{data => }/cosmos/internal/Configs.java | 5 +- .../{data => }/cosmos/internal/Conflict.java | 4 +- .../{data => }/cosmos/internal/Constants.java | 2 +- .../internal/ContentSerializationFormat.java | 2 +- .../{data => }/cosmos/internal/Database.java | 4 +- .../DatabaseAccountConfigurationProvider.java | 4 +- .../DatabaseAccountManagerInternal.java | 6 +- .../cosmos/internal/DatabaseForTest.java | 10 +- .../{data => }/cosmos/internal/Document.java | 10 +- .../cosmos/internal/DocumentCollection.java | 18 ++-- .../DocumentServiceRequestContext.java | 14 +-- .../cosmos/internal/EnumerationDirection.java | 2 +- .../cosmos/internal/Exceptions.java | 4 +- .../cosmos/internal/FanoutOperationState.java | 2 +- .../internal/GlobalEndpointManager.java | 16 +-- .../cosmos/internal/HttpConstants.java | 2 +- .../internal/IAuthorizationTokenProvider.java | 2 +- .../internal/ICollectionRoutingMapCache.java | 5 +- .../internal/IDocumentClientRetryPolicy.java | 2 +- .../cosmos/internal/IRetryPolicy.java | 2 +- .../cosmos/internal/IRetryPolicyFactory.java | 2 +- .../cosmos/internal/IRoutingMapProvider.java | 5 +- .../cosmos/internal/ISessionContainer.java | 6 +- .../cosmos/internal/ISessionToken.java | 4 +- .../{data => }/cosmos/internal/Integers.java | 2 +- .../cosmos/internal/InternalConstants.java | 2 +- .../InvalidPartitionExceptionRetryPolicy.java | 11 ++- .../cosmos/internal/JavaStreamUtils.java | 2 +- .../cosmos/internal/LifeCycleUtils.java | 2 +- .../{data => }/cosmos/internal/Lists.java | 2 +- .../{data => }/cosmos/internal/Longs.java | 2 +- .../internal/MigrateCollectionDirective.java | 2 +- .../cosmos/internal/MutableVolatile.java | 2 +- .../cosmos/internal/ObservableHelper.java | 2 +- .../{data => }/cosmos/internal/Offer.java | 6 +- .../cosmos/internal/OperationType.java | 2 +- .../PartitionKeyMismatchRetryPolicy.java | 11 ++- .../cosmos/internal/PartitionKeyRange.java | 9 +- .../PartitionKeyRangeGoneRetryPolicy.java | 17 ++-- .../{data => }/cosmos/internal/PathInfo.java | 2 +- .../cosmos/internal/PathParser.java | 2 +- .../{data => }/cosmos/internal/Paths.java | 2 +- .../cosmos/internal/PathsHelper.java | 10 +- .../cosmos/internal/Permission.java | 10 +- .../{data => }/cosmos/internal/Quadruple.java | 2 +- .../internal/QueryCompatibilityMode.java | 2 +- .../cosmos/internal/QueryMetrics.java | 10 +- .../internal/QueryMetricsConstants.java | 2 +- .../cosmos/internal/QueryMetricsUtils.java | 2 +- .../internal/QueryPreparationTimes.java | 2 +- .../cosmos/internal/RMResources.java | 2 +- .../cosmos/internal/ReadFeedKeyType.java | 2 +- .../cosmos/internal/RemoteStorageType.java | 2 +- ...enameCollectionAwareClientRetryPolicy.java | 7 +- .../ReplicatedResourceClientUtils.java | 2 +- .../cosmos/internal/ReplicationPolicy.java | 6 +- .../cosmos/internal/RequestChargeTracker.java | 2 +- .../cosmos/internal/RequestOptions.java | 10 +- .../ResetSessionTokenRetryPolicyFactory.java | 5 +- .../cosmos/internal/ResourceId.java | 2 +- .../cosmos/internal/ResourceResponse.java | 6 +- .../internal/ResourceThrottleRetryPolicy.java | 4 +- .../ResourceTokenAuthorizationHelper.java | 8 +- .../cosmos/internal/ResourceType.java | 2 +- .../cosmos/internal/RetryPolicy.java | 6 +- .../cosmos/internal/RetryUtils.java | 2 +- .../cosmos/internal/RuntimeConstants.java | 2 +- .../internal/RuntimeExecutionTimes.java | 4 +- .../cosmos/internal/RxDocumentClientImpl.java | 98 +++++++++++-------- .../internal/RxDocumentServiceRequest.java | 22 +++-- .../internal/RxDocumentServiceResponse.java | 16 +-- .../cosmos/internal/RxGatewayStoreModel.java | 32 +++--- .../cosmos/internal/RxStoreModel.java | 2 +- .../cosmos/internal/SessionContainer.java | 6 +- .../cosmos/internal/SessionTokenHelper.java | 10 +- .../cosmos/internal/StoredProcedure.java | 6 +- .../internal/StoredProcedureResponse.java | 4 +- .../{data => }/cosmos/internal/Strings.java | 2 +- .../cosmos/internal/TestConfigurations.java | 2 +- .../{data => }/cosmos/internal/Trigger.java | 10 +- .../{data => }/cosmos/internal/Undefined.java | 4 +- .../{data => }/cosmos/internal/User.java | 4 +- .../cosmos/internal/UserAgentContainer.java | 2 +- .../cosmos/internal/UserDefinedFunction.java | 6 +- .../{data => }/cosmos/internal/Utils.java | 6 +- .../cosmos/internal/VectorSessionToken.java | 8 +- .../internal/WebExceptionRetryPolicy.java | 5 +- .../cosmos/internal/caches/AsyncCache.java | 2 +- .../cosmos/internal/caches/AsyncLazy.java | 2 +- .../internal/caches/IEqualityComparer.java | 2 +- .../caches/IPartitionKeyRangeCache.java | 20 ++-- .../caches/RxClientCollectionCache.java | 36 +++---- .../internal/caches/RxCollectionCache.java | 21 ++-- .../caches/RxPartitionKeyRangeCache.java | 45 +++++---- .../internal/changefeed/Bootstrapper.java | 2 +- .../changefeed/CancellationToken.java | 2 +- .../changefeed/CancellationTokenSource.java | 2 +- .../changefeed/ChangeFeedContextClient.java | 23 ++++- .../changefeed/ChangeFeedObserver.java | 4 +- .../ChangeFeedObserverCloseReason.java | 2 +- .../changefeed/ChangeFeedObserverContext.java | 6 +- .../changefeed/ChangeFeedObserverFactory.java | 2 +- .../changefeed/CheckpointFrequency.java | 2 +- .../internal/changefeed/HealthMonitor.java | 2 +- .../changefeed/HealthMonitoringRecord.java | 2 +- .../cosmos/internal/changefeed/Lease.java | 4 +- .../changefeed/LeaseCheckpointer.java | 2 +- .../internal/changefeed/LeaseContainer.java | 2 +- .../internal/changefeed/LeaseManager.java | 4 +- .../internal/changefeed/LeaseRenewer.java | 2 +- .../internal/changefeed/LeaseStore.java | 2 +- .../changefeed/LeaseStoreManager.java | 6 +- .../changefeed/LeaseStoreManagerSettings.java | 4 +- .../changefeed/PartitionCheckpointer.java | 2 +- .../changefeed/PartitionController.java | 2 +- .../changefeed/PartitionLoadBalancer.java | 2 +- .../PartitionLoadBalancingStrategy.java | 4 +- .../internal/changefeed/PartitionManager.java | 2 +- .../changefeed/PartitionProcessor.java | 2 +- .../changefeed/PartitionProcessorFactory.java | 2 +- .../changefeed/PartitionSupervisor.java | 2 +- .../PartitionSupervisorFactory.java | 2 +- .../changefeed/PartitionSynchronizer.java | 2 +- .../changefeed/ProcessorSettings.java | 4 +- .../changefeed/RemainingPartitionWork.java | 2 +- .../changefeed/RemainingWorkEstimator.java | 2 +- .../changefeed/RequestOptionsFactory.java | 6 +- .../internal/changefeed/ServiceItemLease.java | 10 +- .../changefeed/ServiceItemLeaseUpdater.java | 6 +- .../exceptions/LeaseLostException.java | 4 +- .../exceptions/ObserverException.java | 2 +- .../exceptions/PartitionException.java | 2 +- .../PartitionNotFoundException.java | 2 +- .../exceptions/PartitionSplitException.java | 2 +- .../exceptions/TaskCancelledException.java | 2 +- .../implementation/AutoCheckpointer.java | 12 +-- .../implementation/BootstrapperImpl.java | 8 +- .../ChangeFeedContextClientImpl.java | 29 ++++-- .../implementation/ChangeFeedHelper.java | 10 +- .../ChangeFeedObserverContextImpl.java | 10 +- .../ChangeFeedObserverFactoryImpl.java | 8 +- .../ChangeFeedProcessorBuilderImpl.java | 42 ++++---- .../CheckpointerObserverFactory.java | 8 +- .../changefeed/implementation/Constants.java | 2 +- .../implementation/DefaultObserver.java | 10 +- .../DefaultObserverFactory.java | 8 +- .../DocumentServiceLeaseStore.java | 25 +++-- .../DocumentServiceLeaseUpdaterImpl.java | 26 ++--- .../EqualPartitionsBalancingStrategy.java | 6 +- .../implementation/ExceptionClassifier.java | 4 +- ...onitoringPartitionControllerDecorator.java | 12 +-- .../implementation/LeaseRenewerImpl.java | 12 +-- .../implementation/LeaseStoreManagerImpl.java | 38 +++---- ...onWrappingChangeFeedObserverDecorator.java | 12 +-- .../PartitionCheckpointerImpl.java | 8 +- .../PartitionControllerImpl.java | 26 ++--- .../PartitionLoadBalancerImpl.java | 18 ++-- .../implementation/PartitionManagerImpl.java | 10 +- .../PartitionProcessorFactoryImpl.java | 22 ++--- .../PartitionProcessorImpl.java | 34 +++---- .../PartitionSupervisorFactoryImpl.java | 22 ++--- .../PartitionSupervisorImpl.java | 30 +++--- .../PartitionSynchronizerImpl.java | 22 ++--- ...edByIdCollectionRequestOptionsFactory.java | 12 +-- .../RemainingPartitionWorkImpl.java | 4 +- .../RemainingWorkEstimatorImpl.java | 10 +- .../implementation/StatusCodeErrorType.java | 2 +- .../implementation/TraceHealthMonitor.java | 6 +- .../changefeed/implementation/WorkerTask.java | 4 +- .../internal/directconnectivity/Address.java | 8 +- .../AddressInformation.java | 2 +- .../directconnectivity/AddressResolver.java | 48 ++++----- .../directconnectivity/AddressSelector.java | 8 +- .../BarrierRequestHelper.java | 28 +++--- .../directconnectivity/ConsistencyReader.java | 34 +++---- .../directconnectivity/ConsistencyWriter.java | 34 +++---- .../directconnectivity/CustomHeaders.java | 2 +- .../directconnectivity/ErrorUtils.java | 6 +- .../GatewayAddressCache.java | 62 ++++++------ .../GatewayServiceConfigurationReader.java | 34 +++---- .../GlobalAddressResolver.java | 30 +++--- .../GoneAndRetryWithRetryPolicy.java | 26 ++--- .../directconnectivity/HttpClientUtils.java | 18 ++-- .../HttpTransportClient.java | 88 ++++++++--------- .../directconnectivity/HttpUtils.java | 10 +- .../directconnectivity/IAddressCache.java | 6 +- .../directconnectivity/IAddressResolver.java | 4 +- .../directconnectivity/IStoreClient.java | 8 +- .../internal/directconnectivity/Protocol.java | 2 +- .../QueryRequestPerformanceActivity.java | 2 +- .../directconnectivity/QuorumReader.java | 32 +++--- .../internal/directconnectivity/ReadMode.java | 2 +- .../ReplicatedResourceClient.java | 28 +++--- .../directconnectivity/RequestHelper.java | 16 +-- .../directconnectivity/ResourceOperation.java | 6 +- .../directconnectivity/ResponseUtils.java | 8 +- .../RntbdTransportClient.java | 20 ++-- .../directconnectivity/ServerProperties.java | 2 +- .../directconnectivity/ServerStoreModel.java | 18 ++-- .../directconnectivity/ServiceConfig.java | 2 +- .../directconnectivity/StoreClient.java | 44 ++++----- .../StoreClientFactory.java | 10 +- .../directconnectivity/StoreReader.java | 44 ++++----- .../directconnectivity/StoreResponse.java | 6 +- .../directconnectivity/StoreResult.java | 22 ++--- .../directconnectivity/TimeoutHelper.java | 6 +- .../directconnectivity/TransportClient.java | 4 +- .../TransportException.java | 2 +- .../directconnectivity/WFConstants.java | 2 +- .../WebExceptionUtility.java | 4 +- .../rntbd/RntbdClientChannelHandler.java | 15 ++- .../RntbdClientChannelHealthChecker.java | 10 +- .../rntbd/RntbdClientChannelPool.java | 10 +- .../rntbd/RntbdConstants.java | 2 +- .../rntbd/RntbdContext.java | 8 +- .../rntbd/RntbdContextDecoder.java | 2 +- .../rntbd/RntbdContextException.java | 10 +- .../rntbd/RntbdContextNegotiator.java | 6 +- .../rntbd/RntbdContextRequest.java | 14 +-- .../rntbd/RntbdContextRequestDecoder.java | 2 +- .../rntbd/RntbdContextRequestEncoder.java | 2 +- .../rntbd/RntbdEndpoint.java | 6 +- .../directconnectivity/rntbd/RntbdFramer.java | 2 +- .../rntbd/RntbdHealthCheckRequest.java | 2 +- .../rntbd/RntbdMetrics.java | 4 +- .../rntbd/RntbdObjectMapper.java | 2 +- .../rntbd/RntbdReporter.java | 2 +- .../rntbd/RntbdRequest.java | 6 +- .../rntbd/RntbdRequestArgs.java | 4 +- .../rntbd/RntbdRequestDecoder.java | 2 +- .../rntbd/RntbdRequestEncoder.java | 2 +- .../rntbd/RntbdRequestFrame.java | 10 +- .../rntbd/RntbdRequestFramer.java | 2 +- .../rntbd/RntbdRequestHeaders.java | 52 +++++----- .../rntbd/RntbdRequestManager.java | 60 ++++++------ .../rntbd/RntbdRequestRecord.java | 8 +- .../rntbd/RntbdRequestTimer.java | 2 +- .../rntbd/RntbdResponse.java | 6 +- .../rntbd/RntbdResponseDecoder.java | 2 +- .../rntbd/RntbdResponseHeaders.java | 12 +-- .../rntbd/RntbdResponseStatus.java | 2 +- .../rntbd/RntbdServiceEndpoint.java | 12 +-- .../directconnectivity/rntbd/RntbdToken.java | 4 +- .../rntbd/RntbdTokenStream.java | 4 +- .../rntbd/RntbdTokenType.java | 2 +- .../directconnectivity/rntbd/RntbdUUID.java | 2 +- .../internal/http/BufferedHttpResponse.java | 2 +- .../cosmos/internal/http/HttpClient.java | 2 +- .../internal/http/HttpClientConfig.java | 6 +- .../cosmos/internal/http/HttpHeader.java | 2 +- .../cosmos/internal/http/HttpHeaders.java | 2 +- .../cosmos/internal/http/HttpRequest.java | 2 +- .../cosmos/internal/http/HttpResponse.java | 2 +- .../internal/http/ReactorNettyClient.java | 4 +- ...ggregateDocumentQueryExecutionContext.java | 39 +++++--- .../query/CompositeContinuationToken.java | 11 ++- .../DefaultDocumentQueryExecutionContext.java | 69 +++++++------ .../internal/query/DocumentProducer.java | 49 +++++----- .../DocumentQueryExecutionContextBase.java | 44 +++++---- .../DocumentQueryExecutionContextFactory.java | 31 +++--- .../internal/query/ExceptionHelper.java | 2 +- .../cosmos/internal/query/Fetcher.java | 10 +- .../internal/query/IDocumentQueryClient.java | 16 +-- .../IDocumentQueryExecutionComponent.java | 6 +- .../query/IDocumentQueryExecutionContext.java | 6 +- .../cosmos/internal/query/ItemComparator.java | 2 +- .../cosmos/internal/query/ItemType.java | 2 +- .../cosmos/internal/query/ItemTypeHelper.java | 4 +- .../query/OrderByContinuationToken.java | 8 +- .../query/OrderByDocumentProducer.java | 30 +++--- .../OrderByDocumentQueryExecutionContext.java | 43 ++++---- .../cosmos/internal/query/OrderByUtils.java | 22 +++-- .../cosmos/internal/query/Paginator.java | 12 +-- ...ParallelDocumentQueryExecutionContext.java | 30 +++--- ...llelDocumentQueryExecutionContextBase.java | 31 +++--- .../internal/query/ParallelQueryConfig.java | 2 +- .../query/PartitionedQueryExecutionInfo.java | 11 ++- ...PartitionedQueryExecutionInfoInternal.java | 16 +-- ...ipelinedDocumentQueryExecutionContext.java | 18 ++-- .../ProxyDocumentQueryExecutionContext.java | 26 ++--- .../cosmos/internal/query/QueryInfo.java | 7 +- .../cosmos/internal/query/QueryItem.java | 6 +- .../cosmos/internal/query/SortOrder.java | 2 +- .../internal/query/TakeContinuationToken.java | 8 +- .../TopDocumentQueryExecutionContext.java | 16 +-- .../cosmos/internal/query/TriFunction.java | 2 +- .../query/aggregation/AggregateOperator.java | 2 +- .../query/aggregation/Aggregator.java | 2 +- .../query/aggregation/AverageAggregator.java | 6 +- .../query/aggregation/CountAggregator.java | 2 +- .../query/aggregation/MaxAggregator.java | 6 +- .../query/aggregation/MinAggregator.java | 6 +- .../query/aggregation/SumAggregator.java | 4 +- .../query/metrics/ClientSideMetrics.java | 2 +- .../query/metrics/FetchExecutionRange.java | 2 +- .../FetchExecutionRangeAccumulator.java | 2 +- .../query/metrics/QueryMetricsTextWriter.java | 2 +- .../query/metrics/QueryMetricsWriter.java | 10 +- .../query/metrics/SchedulingStopwatch.java | 2 +- .../query/metrics/SchedulingTimeSpan.java | 2 +- .../internal/query/metrics/TextTable.java | 2 +- .../query/orderbyquery/OrderByRowResult.java | 8 +- .../orderbyquery/OrderbyRowComparer.java | 12 +-- .../routing/BoolPartitionKeyComponent.java | 4 +- .../routing/CaseInsensitiveHashMap.java | 2 +- .../routing/CollectionRoutingMap.java | 4 +- .../routing/IPartitionKeyComponent.java | 2 +- .../internal/routing/IServerIdentity.java | 2 +- .../routing/InMemoryCollectionRoutingMap.java | 4 +- .../InfinityPartitionKeyComponent.java | 4 +- .../cosmos/internal/routing/Int128.java | 2 +- .../internal/routing/LocationCache.java | 23 ++--- .../internal/routing/LocationHelper.java | 2 +- .../MaxNumberPartitionKeyComponent.java | 4 +- .../MaxStringPartitionKeyComponent.java | 4 +- .../MinNumberPartitionKeyComponent.java | 4 +- .../MinStringPartitionKeyComponent.java | 4 +- .../internal/routing/MurmurHash3_128.java | 2 +- .../internal/routing/MurmurHash3_32.java | 2 +- .../routing/NullPartitionKeyComponent.java | 4 +- .../routing/NumberPartitionKeyComponent.java | 4 +- .../PartitionKeyAndResourceTokenPair.java | 2 +- .../routing/PartitionKeyComponentType.java | 2 +- .../routing/PartitionKeyInternal.java | 12 +-- .../routing/PartitionKeyInternalHelper.java | 16 +-- .../routing/PartitionKeyRangeIdentity.java | 2 +- .../cosmos/internal/routing/Range.java | 8 +- .../internal/routing/RoutingMapProvider.java | 4 +- .../routing/RoutingMapProviderHelper.java | 4 +- .../routing/StringPartitionKeyComponent.java | 6 +- .../cosmos/internal/routing/UInt128.java | 2 +- .../UndefinedPartitionKeyComponent.java | 4 +- .../azure/{data => }/cosmos/package-info.java | 2 +- .../azure/{data => }/cosmos/BridgeUtils.java | 2 +- .../cosmos/ClientUnderTestBuilder.java | 8 +- .../{data => }/cosmos/ConflictTests.java | 6 +- .../cosmos/ConnectionPolicyTest.java | 4 +- .../cosmos/CosmosAsyncClientTest.java | 2 +- .../cosmos/CosmosClientExceptionTest.java | 34 +++---- .../cosmos/CosmosContainerTest.java | 7 +- .../cosmos/CosmosDatabaseForTest.java | 2 +- .../{data => }/cosmos/CosmosDatabaseTest.java | 7 +- .../{data => }/cosmos/CosmosItemTest.java | 7 +- .../cosmos/CosmosKeyCredentialTest.java | 10 +- .../cosmos/CosmosPartitionKeyTests.java | 34 ++++--- .../cosmos/CosmosResponseValidator.java | 6 +- .../cosmos/CosmosSyncStoredProcTest.java | 7 +- .../{data => }/cosmos/CosmosSyncUDFTest.java | 5 +- .../{data => }/cosmos/CosmosTriggerTest.java | 5 +- .../{data => }/cosmos/CosmosUserTest.java | 5 +- .../{data => }/cosmos/DocumentClientTest.java | 4 +- .../cosmos/DocumentCollectionTests.java | 7 +- .../{data => }/cosmos/DocumentTests.java | 6 +- .../{data => }/cosmos/GatewayTestUtils.java | 4 +- .../{data => }/cosmos/IncludedPathTest.java | 9 +- .../cosmos/JsonSerializableTests.java | 6 +- .../cosmos/PartitionKeyHashingTests.java | 6 +- .../{data => }/cosmos/PermissionTest.java | 4 +- .../{data => }/cosmos/ResourceIdTests.java | 4 +- .../internal/ClientRetryPolicyTest.java | 4 +- .../cosmos/internal/ConfigsBuilder.java | 4 +- .../cosmos/internal/ConfigsTests.java | 4 +- .../cosmos/internal/ConsistencyTests1.java | 16 +-- .../cosmos/internal/ConsistencyTests2.java | 24 ++--- .../cosmos/internal/ConsistencyTestsBase.java | 39 ++++---- .../DocumentQuerySpyWireContentTest.java | 12 +-- ...ocumentServiceRequestContextValidator.java | 6 +- .../DocumentServiceRequestValidator.java | 4 +- .../cosmos/internal/FailureValidator.java | 10 +- .../internal/FeedResponseListValidator.java | 12 +-- .../internal/FeedResponseValidator.java | 6 +- .../internal/HttpClientUnderTestWrapper.java | 6 +- .../cosmos/internal/LocationHelperTest.java | 4 +- .../cosmos/internal/NetworkFailureTest.java | 2 +- .../cosmos/internal/ParallelAsync.java | 2 +- .../cosmos/internal/PathsHelperTest.java | 2 +- ...eCollectionAwareClientRetryPolicyTest.java | 14 +-- .../internal/ResourceResponseValidator.java | 20 ++-- .../cosmos/internal/ResourceValidator.java | 4 +- .../cosmos/internal/RetryAnalyzer.java | 3 +- .../internal/RetryCreateDocumentTest.java | 6 +- .../cosmos/internal/RetryThrottleTest.java | 13 +-- .../cosmos/internal/RetryUtilsTest.java | 10 +- .../internal/RxDocumentClientUnderTest.java | 16 +-- .../RxDocumentServiceRequestTest.java | 2 +- .../internal/RxGatewayStoreModelTest.java | 10 +- .../cosmos/internal/SessionContainerTest.java | 9 +- .../cosmos/internal/SessionTest.java | 20 ++-- .../cosmos/internal/SessionTokenTest.java | 6 +- .../cosmos/internal/ShouldRetryValidator.java | 4 +- .../cosmos/internal/SpyClientBuilder.java | 2 +- .../internal/SpyClientUnderTestFactory.java | 26 ++--- .../cosmos/internal/StoreHeaderTests.java | 2 +- .../cosmos/internal/StoreResponseBuilder.java | 8 +- .../cosmos/internal/TestSuiteBase.java | 50 +++++----- .../{data => }/cosmos/internal/TestUtils.java | 2 +- .../cosmos/internal/TimeTokenTest.java | 2 +- .../internal/caches/AsyncCacheTest.java | 2 +- .../AddressResolverTest.java | 42 ++++---- .../AddressSelectorTest.java | 16 +-- .../AddressSelectorWrapper.java | 14 +-- .../directconnectivity/AddressValidator.java | 2 +- .../BarrierRequestHelperTest.java | 24 ++--- .../ConsistencyReaderTest.java | 31 ++++-- .../ConsistencyReaderUnderTest.java | 8 +- .../ConsistencyWriterTest.java | 31 +++--- .../DCDocumentCrudTest.java | 62 ++++++------ .../directconnectivity/EndpointMock.java | 10 +- .../directconnectivity/ExceptionBuilder.java | 14 +-- .../Function1WithCheckedException.java | 2 +- .../Function2WithCheckedException.java | 2 +- .../GatewayAddressCacheTest.java | 51 ++++++---- ...GatewayServiceConfigurationReaderTest.java | 33 +++---- .../GatewayServiceConfiguratorReaderMock.java | 8 +- .../GlobalAddressResolverTest.java | 36 +++---- .../GoneAndRetryWithRetryPolicyTest.java | 26 ++--- .../HttpClientMockWrapper.java | 11 +-- .../HttpTransportClientTest.java | 64 ++++++------ .../directconnectivity/HttpUtilsTest.java | 10 +- .../MultiStoreResultValidator.java | 9 +- .../MurmurHash3_32Test.java | 4 +- .../PartitionKeyInternalTest.java | 20 ++-- .../directconnectivity/PartitionKeyTest.java | 12 +-- .../PartitionReplicasAddressesValidator.java | 10 +- .../directconnectivity/QuorumReaderTest.java | 18 +++- .../directconnectivity/ReflectionUtils.java | 10 +- .../ReplicaAddressFactory.java | 6 +- ...catedResourceClientPartitionSplitTest.java | 24 +++-- .../ReplicatedResourceClientTest.java | 20 ++-- .../RntbdTransportClientTest.java | 96 +++++++++--------- .../StoreReaderDotNetTest.java | 36 +++++-- .../directconnectivity/StoreReaderTest.java | 43 +++++--- .../StoreReaderUnderTest.java | 6 +- .../directconnectivity/StoreResponseTest.java | 6 +- .../StoreResponseValidator.java | 8 +- .../StoreResultValidator.java | 6 +- .../directconnectivity/TimeoutHelperTest.java | 3 +- .../TransportClientWrapper.java | 7 +- .../WebExceptionUtilityTest.java | 3 +- .../internal/query/DocumentProducerTest.java | 41 ++++---- .../internal/query/FeedResponseBuilder.java | 12 +-- .../cosmos/internal/query/FetcherTest.java | 12 +-- .../InMemoryCollectionRoutingMapTest.java | 4 +- .../internal/routing/LocationCacheTest.java | 25 +++-- .../routing/PartitionKeyInternalUtils.java | 2 +- .../routing/RoutingMapProviderHelperTest.java | 4 +- .../StringPartitionKeyComponentTest.java | 2 +- .../cosmos/rx/AggregateQueryTests.java | 17 ++-- .../rx/BackPressureCrossPartitionTest.java | 29 ++++-- .../cosmos/rx/BackPressureTest.java | 32 +++--- .../cosmos/rx/ChangeFeedProcessorTest.java | 30 ++++-- .../{data => }/cosmos/rx/ChangeFeedTest.java | 33 ++++--- .../cosmos/rx/CollectionCrudTest.java | 34 +++++-- .../cosmos/rx/CollectionQueryTest.java | 19 ++-- .../cosmos/rx/CosmosAsyncConflictTest.java | 14 ++- .../cosmos/rx/DatabaseCrudTest.java | 16 ++- .../cosmos/rx/DatabaseQueryTest.java | 17 ++-- .../rx/DocumentClientResourceLeakTest.java | 9 +- .../cosmos/rx/DocumentCrudTest.java | 27 +++-- .../{data => }/cosmos/rx/LogLevelTest.java | 22 +++-- .../rx/MultiMasterConflictResolutionTest.java | 23 +++-- .../cosmos/rx/MultiOrderByQueryTests.java | 20 +++- .../{data => }/cosmos/rx/OfferQueryTest.java | 26 ++--- .../cosmos/rx/OfferReadReplaceTest.java | 17 ++-- .../cosmos/rx/OrderbyDocumentQueryTest.java | 43 +++++--- .../cosmos/rx/ParallelDocumentQueryTest.java | 37 ++++--- .../{data => }/cosmos/rx/ParsingEnvTest.java | 6 +- .../cosmos/rx/PermissionCrudTest.java | 19 +++- .../cosmos/rx/PermissionQueryTest.java | 33 ++++--- .../{data => }/cosmos/rx/ProxyHostTest.java | 25 +++-- .../cosmos/rx/ReadFeedCollectionsTest.java | 20 ++-- .../cosmos/rx/ReadFeedDatabasesTest.java | 14 ++- .../cosmos/rx/ReadFeedDocumentsTest.java | 26 +++-- .../rx/ReadFeedExceptionHandlingTest.java | 9 +- .../cosmos/rx/ReadFeedOffersTest.java | 23 +++-- .../cosmos/rx/ReadFeedPermissionsTest.java | 24 +++-- .../cosmos/rx/ReadFeedPkrTests.java | 17 ++-- .../rx/ReadFeedStoredProceduresTest.java | 23 +++-- .../cosmos/rx/ReadFeedTriggersTest.java | 24 +++-- .../cosmos/rx/ReadFeedUdfsTest.java | 24 +++-- .../cosmos/rx/ReadFeedUsersTest.java | 17 ++-- .../cosmos/rx/ResourceTokenTest.java | 40 +++++--- .../cosmos/rx/SimpleSerializationTest.java | 8 +- .../rx/SinglePartitionDocumentQueryTest.java | 33 ++++--- .../SinglePartitionReadFeedDocumentsTest.java | 14 ++- .../cosmos/rx/StoredProcedureCrudTest.java | 16 ++- .../cosmos/rx/StoredProcedureQueryTest.java | 25 +++-- .../rx/StoredProcedureUpsertReplaceTest.java | 22 +++-- .../{data => }/cosmos/rx/TestSuiteBase.java | 66 ++++++++++--- .../cosmos/rx/TokenResolverTest.java | 56 ++++++----- .../{data => }/cosmos/rx/TopQueryTests.java | 28 +++--- .../{data => }/cosmos/rx/TriggerCrudTest.java | 21 ++-- .../cosmos/rx/TriggerQueryTest.java | 28 ++++-- .../cosmos/rx/TriggerUpsertReplaceTest.java | 18 ++-- .../{data => }/cosmos/rx/UniqueIndexTest.java | 33 +++++-- .../{data => }/cosmos/rx/UserCrudTest.java | 18 ++-- .../rx/UserDefinedFunctionCrudTest.java | 13 ++- .../rx/UserDefinedFunctionQueryTest.java | 29 +++--- .../UserDefinedFunctionUpsertReplaceTest.java | 18 ++-- .../{data => }/cosmos/rx/UserQueryTest.java | 25 +++-- .../cosmos/rx/VeryLargeDocumentQueryTest.java | 19 ++-- .../rx/proxy/HttpProxyChannelInitializer.java | 2 +- .../rx/proxy/HttpProxyClientHandler.java | 2 +- .../rx/proxy/HttpProxyClientHeader.java | 2 +- .../rx/proxy/HttpProxyRemoteHandler.java | 2 +- .../cosmos/rx/proxy/HttpProxyServer.java | 2 +- .../src/test/resources/emulator-testng.xml | 2 +- .../src/test/resources/fast-testng.xml | 2 +- .../src/test/resources/long-testng.xml | 2 +- 691 files changed, 4356 insertions(+), 3518 deletions(-) rename sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/{data => }/cosmos/benchmark/AsyncBenchmark.java (91%) rename sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/{data => }/cosmos/benchmark/AsyncMixedBenchmark.java (88%) rename sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/{data => }/cosmos/benchmark/AsyncQueryBenchmark.java (94%) rename sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/{data => }/cosmos/benchmark/AsyncQuerySinglePartitionMultiple.java (85%) rename sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/{data => }/cosmos/benchmark/AsyncReadBenchmark.java (90%) rename sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/{data => }/cosmos/benchmark/AsyncWriteBenchmark.java (93%) rename sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/{data => }/cosmos/benchmark/Configuration.java (98%) rename sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/{data => }/cosmos/benchmark/DocDBUtils.java (78%) rename sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/{data => }/cosmos/benchmark/Main.java (98%) rename sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/{data => }/cosmos/benchmark/ReadMyWriteWorkflow.java (96%) rename sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/{data => }/cosmos/benchmark/QueryBuilderTest.java (97%) rename sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/{data => }/cosmos/benchmark/ReadMyWritesConsistencyTest.java (93%) rename sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/{data => }/cosmos/benchmark/Utils.java (84%) rename sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/{data => }/cosmos/benchmark/WorkflowTest.java (95%) rename sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/{data => }/cosmos/examples/AccountSettings.java (97%) rename sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/{data => }/cosmos/examples/BasicDemo.java (92%) rename sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/{data => }/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java (93%) rename sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/{data => }/cosmos/examples/ChangeFeed/SampleConfigurations.java (96%) rename sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/{data => }/cosmos/examples/HelloWorldDemo.java (96%) rename sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/{data => }/cosmos/rx/examples/multimaster/ConfigurationManager.java (82%) rename sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/{data => }/cosmos/rx/examples/multimaster/Helpers.java (91%) rename sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/{data => }/cosmos/rx/examples/multimaster/samples/ConflictWorker.java (97%) rename sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/{data => }/cosmos/rx/examples/multimaster/samples/Main.java (91%) rename sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/{data => }/cosmos/rx/examples/multimaster/samples/MultiMasterScenario.java (95%) rename sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/{data => }/cosmos/rx/examples/multimaster/samples/Worker.java (94%) rename sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/{data => }/cosmos/DocumentClientTest.java (94%) rename sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/{data => }/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java (94%) rename sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/{data => }/cosmos/rx/examples/ConflictAPITest.java (89%) rename sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/{data => }/cosmos/rx/examples/DatabaseCRUDAsyncAPITest.java (96%) rename sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/{data => }/cosmos/rx/examples/DocumentCRUDAsyncAPITest.java (96%) rename sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/{data => }/cosmos/rx/examples/DocumentQueryAsyncAPITest.java (95%) rename sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/{data => }/cosmos/rx/examples/InMemoryGroupbyTest.java (90%) rename sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/{data => }/cosmos/rx/examples/OfferCRUDAsyncAPITest.java (88%) rename sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/{data => }/cosmos/rx/examples/StoredProcedureAsyncAPITest.java (92%) rename sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/{data => }/cosmos/rx/examples/TestConfigurations.java (97%) rename sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/{data => }/cosmos/rx/examples/TokenResolverTest.java (94%) rename sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/{data => }/cosmos/rx/examples/UniqueIndexAsyncAPITest.java (86%) rename sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/{data => }/cosmos/rx/examples/Utils.java (83%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/AccessCondition.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/AccessConditionType.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/BadRequestException.java (82%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/BridgeInternal.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/ChangeFeedOptions.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/ChangeFeedProcessor.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/ChangeFeedProcessorOptions.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/ClientSideRequestStatistics.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CommonsBridgeInternal.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CompositePath.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CompositePathSortOrder.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/ConflictException.java (81%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/ConflictResolutionMode.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/ConflictResolutionPolicy.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/ConnectionMode.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/ConnectionPolicy.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/ConsistencyLevel.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/ConsistencyPolicy.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncClient.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncConflict.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncConflictResponse.java (85%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncContainer.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncContainerResponse.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncDatabase.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncDatabaseResponse.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncItem.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncItemResponse.java (82%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncPermission.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncPermissionResponse.java (83%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncScripts.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncStoredProcedure.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncStoredProcedureResponse.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncTrigger.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncTriggerResponse.java (84%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncUser.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncUserDefinedFunction.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncUserDefinedFunctionResponse.java (85%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosAsyncUserResponse.java (82%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosBridgeInternal.java (87%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosClient.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosClientBuilder.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosClientException.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosConflictProperties.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosConflictRequestOptions.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosContainer.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosContainerProperties.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosContainerRequestOptions.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosContainerResponse.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosDatabase.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosDatabaseProperties.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosDatabaseRequestOptions.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosDatabaseResponse.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosError.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosItem.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosItemProperties.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosItemRequestOptions.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosItemResponse.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosKeyCredential.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosPermissionProperties.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosPermissionRequestOptions.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosResourceType.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosResponse.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosResponseDiagnostics.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosScripts.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosStoredProcedure.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosStoredProcedureProperties.java (85%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosStoredProcedureRequestOptions.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosStoredProcedureResponse.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosTrigger.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosTriggerProperties.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosTriggerResponse.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosUser.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosUserDefinedFunction.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosUserDefinedFunctionProperties.java (84%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosUserDefinedFunctionResponse.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosUserProperties.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/CosmosUserResponse.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/DataType.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/DatabaseAccount.java (85%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/DatabaseAccountLocation.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/ExcludedPath.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/FeedOptions.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/FeedResponse.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/FeedResponseDiagnostics.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/ForbiddenException.java (78%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/GoneException.java (83%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/HashIndex.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/IncludedPath.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/Index.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/IndexKind.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/IndexingDirective.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/IndexingMode.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/IndexingPolicy.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/InternalServerErrorException.java (87%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/InvalidPartitionException.java (78%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/JsonSerializable.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/LockedException.java (79%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/MethodNotAllowedException.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/NotFoundException.java (83%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/PartitionIsMigratingException.java (78%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/PartitionKey.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/PartitionKeyDefinition.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/PartitionKeyDefinitionVersion.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/PartitionKeyRangeGoneException.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/PartitionKeyRangeIsSplittingException.java (79%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/PartitionKind.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/PermissionMode.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/PreconditionFailedException.java (81%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/RangeIndex.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/RequestEntityTooLargeException.java (81%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/RequestRateTooLargeException.java (82%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/RequestTimeoutException.java (81%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/Resource.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/RetryOptions.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/RetryWithException.java (82%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/SerializationFormattingPolicy.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/ServiceUnavailableException.java (87%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/SpatialIndex.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/SpatialSpec.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/SpatialType.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/SqlParameter.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/SqlParameterList.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/SqlQuerySpec.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/TokenResolver.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/TriggerOperation.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/TriggerType.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/UnauthorizedException.java (78%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/UniqueKey.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/UniqueKeyPolicy.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/AsyncDocumentClient.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/AuthorizationTokenProvider.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/AuthorizationTokenType.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/BackoffRetryUtility.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/BaseAuthorizationTokenProvider.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/BaseDatabaseAccountConfigurationProvider.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Bytes.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ChangeFeedQueryImpl.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ClearingSessionContainerClientRetryPolicy.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ClientRetryPolicy.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Configs.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Conflict.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Constants.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ContentSerializationFormat.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Database.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/DatabaseAccountConfigurationProvider.java (82%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/DatabaseAccountManagerInternal.java (84%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/DatabaseForTest.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Document.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/DocumentCollection.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/DocumentServiceRequestContext.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/EnumerationDirection.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Exceptions.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/FanoutOperationState.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/GlobalEndpointManager.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/HttpConstants.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/IAuthorizationTokenProvider.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ICollectionRoutingMapCache.java (84%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/IDocumentClientRetryPolicy.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/IRetryPolicy.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/IRetryPolicyFactory.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/IRoutingMapProvider.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ISessionContainer.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ISessionToken.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Integers.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/InternalConstants.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/InvalidPartitionExceptionRetryPolicy.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/JavaStreamUtils.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/LifeCycleUtils.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Lists.java (87%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Longs.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/MigrateCollectionDirective.java (85%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/MutableVolatile.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ObservableHelper.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Offer.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/OperationType.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/PartitionKeyMismatchRetryPolicy.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/PartitionKeyRange.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/PartitionKeyRangeGoneRetryPolicy.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/PathInfo.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/PathParser.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Paths.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/PathsHelper.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Permission.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Quadruple.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/QueryCompatibilityMode.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/QueryMetrics.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/QueryMetricsConstants.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/QueryMetricsUtils.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/QueryPreparationTimes.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/RMResources.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ReadFeedKeyType.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/RemoteStorageType.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/RenameCollectionAwareClientRetryPolicy.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ReplicatedResourceClientUtils.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ReplicationPolicy.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/RequestChargeTracker.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/RequestOptions.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ResetSessionTokenRetryPolicyFactory.java (84%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ResourceId.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ResourceResponse.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ResourceThrottleRetryPolicy.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ResourceTokenAuthorizationHelper.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/ResourceType.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/RetryPolicy.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/RetryUtils.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/RuntimeConstants.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/RuntimeExecutionTimes.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/RxDocumentClientImpl.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/RxDocumentServiceRequest.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/RxDocumentServiceResponse.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/RxGatewayStoreModel.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/RxStoreModel.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/SessionContainer.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/SessionTokenHelper.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/StoredProcedure.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/StoredProcedureResponse.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Strings.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/TestConfigurations.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Trigger.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Undefined.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/User.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/UserAgentContainer.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/UserDefinedFunction.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/Utils.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/VectorSessionToken.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/WebExceptionRetryPolicy.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/caches/AsyncCache.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/caches/AsyncLazy.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/caches/IEqualityComparer.java (79%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/caches/IPartitionKeyRangeCache.java (64%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/caches/RxClientCollectionCache.java (78%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/caches/RxCollectionCache.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/caches/RxPartitionKeyRangeCache.java (87%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/Bootstrapper.java (87%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/CancellationToken.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/CancellationTokenSource.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/ChangeFeedContextClient.java (87%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/ChangeFeedObserver.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/ChangeFeedObserverCloseReason.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/ChangeFeedObserverContext.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/ChangeFeedObserverFactory.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/CheckpointFrequency.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/HealthMonitor.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/HealthMonitoringRecord.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/Lease.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/LeaseCheckpointer.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/LeaseContainer.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/LeaseManager.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/LeaseRenewer.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/LeaseStore.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/LeaseStoreManager.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/LeaseStoreManagerSettings.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/PartitionCheckpointer.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/PartitionController.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/PartitionLoadBalancer.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/PartitionLoadBalancingStrategy.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/PartitionManager.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/PartitionProcessor.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/PartitionProcessorFactory.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/PartitionSupervisor.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/PartitionSupervisorFactory.java (87%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/PartitionSynchronizer.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/ProcessorSettings.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/RemainingPartitionWork.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/RemainingWorkEstimator.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/RequestOptionsFactory.java (69%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/ServiceItemLease.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/ServiceItemLeaseUpdater.java (73%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/exceptions/LeaseLostException.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/exceptions/ObserverException.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/exceptions/PartitionException.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/exceptions/PartitionNotFoundException.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/exceptions/PartitionSplitException.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/exceptions/TaskCancelledException.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/AutoCheckpointer.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/BootstrapperImpl.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/ChangeFeedContextClientImpl.java (83%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/ChangeFeedHelper.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/ChangeFeedObserverContextImpl.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/ChangeFeedObserverFactoryImpl.java (70%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/ChangeFeedProcessorBuilderImpl.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/CheckpointerObserverFactory.java (84%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/Constants.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/DefaultObserver.java (79%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/DefaultObserverFactory.java (71%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/DocumentServiceLeaseStore.java (87%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/DocumentServiceLeaseUpdaterImpl.java (83%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/EqualPartitionsBalancingStrategy.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/ExceptionClassifier.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/HealthMonitoringPartitionControllerDecorator.java (80%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/LeaseRenewerImpl.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/LeaseStoreManagerImpl.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/ObserverExceptionWrappingChangeFeedObserverDecorator.java (82%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/PartitionCheckpointerImpl.java (81%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/PartitionControllerImpl.java (87%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/PartitionLoadBalancerImpl.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/PartitionManagerImpl.java (77%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/PartitionProcessorFactoryImpl.java (79%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/PartitionProcessorImpl.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/PartitionSupervisorFactoryImpl.java (74%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/PartitionSupervisorImpl.java (80%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/PartitionSynchronizerImpl.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/PartitionedByIdCollectionRequestOptionsFactory.java (70%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/RemainingPartitionWorkImpl.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/RemainingWorkEstimatorImpl.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/StatusCodeErrorType.java (83%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/TraceHealthMonitor.java (79%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/changefeed/implementation/WorkerTask.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/Address.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/AddressInformation.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/AddressResolver.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/AddressSelector.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/BarrierRequestHelper.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/ConsistencyReader.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/ConsistencyWriter.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/CustomHeaders.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/ErrorUtils.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/GatewayAddressCache.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/GatewayServiceConfigurationReader.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/GlobalAddressResolver.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/GoneAndRetryWithRetryPolicy.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/HttpClientUtils.java (77%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/HttpTransportClient.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/HttpUtils.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/IAddressCache.java (83%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/IAddressResolver.java (72%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/IStoreClient.java (82%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/Protocol.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/QueryRequestPerformanceActivity.java (80%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/QuorumReader.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/ReadMode.java (76%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/ReplicatedResourceClient.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/RequestHelper.java (76%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/ResourceOperation.java (71%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/ResponseUtils.java (83%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/RntbdTransportClient.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/ServerProperties.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/ServerStoreModel.java (78%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/ServiceConfig.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/StoreClient.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/StoreClientFactory.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/StoreReader.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/StoreResponse.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/StoreResult.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/TimeoutHelper.java (87%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/TransportClient.java (83%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/TransportException.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/WFConstants.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/WebExceptionUtility.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelHandler.java (84%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelHealthChecker.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelPool.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdConstants.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdContext.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdContextDecoder.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdContextException.java (81%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdContextNegotiator.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdContextRequest.java (87%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdContextRequestDecoder.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdContextRequestEncoder.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdEndpoint.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdFramer.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdHealthCheckRequest.java (82%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdMetrics.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdObjectMapper.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdReporter.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdRequest.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdRequestArgs.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdRequestDecoder.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdRequestEncoder.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdRequestFrame.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdRequestFramer.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdRequestHeaders.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdRequestManager.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdRequestRecord.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdRequestTimer.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdResponse.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdResponseDecoder.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdResponseHeaders.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdResponseStatus.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdServiceEndpoint.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdToken.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdTokenStream.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdTokenType.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/directconnectivity/rntbd/RntbdUUID.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/http/BufferedHttpResponse.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/http/HttpClient.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/http/HttpClientConfig.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/http/HttpHeader.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/http/HttpHeaders.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/http/HttpRequest.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/http/HttpResponse.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/http/ReactorNettyClient.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/AggregateDocumentQueryExecutionContext.java (80%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/CompositeContinuationToken.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/DefaultDocumentQueryExecutionContext.java (82%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/DocumentProducer.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/DocumentQueryExecutionContextBase.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/DocumentQueryExecutionContextFactory.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/ExceptionHelper.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/Fetcher.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/IDocumentQueryClient.java (77%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/IDocumentQueryExecutionComponent.java (76%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/IDocumentQueryExecutionContext.java (75%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/ItemComparator.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/ItemType.java (87%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/ItemTypeHelper.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/OrderByContinuationToken.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/OrderByDocumentProducer.java (81%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/OrderByDocumentQueryExecutionContext.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/OrderByUtils.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/Paginator.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/ParallelDocumentQueryExecutionContext.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/ParallelDocumentQueryExecutionContextBase.java (89%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/ParallelQueryConfig.java (88%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/PartitionedQueryExecutionInfo.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/PartitionedQueryExecutionInfoInternal.java (83%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/PipelinedDocumentQueryExecutionContext.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/ProxyDocumentQueryExecutionContext.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/QueryInfo.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/QueryItem.java (79%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/SortOrder.java (82%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/TakeContinuationToken.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/TopDocumentQueryExecutionContext.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/TriFunction.java (92%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/aggregation/AggregateOperator.java (75%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/aggregation/Aggregator.java (76%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/aggregation/AverageAggregator.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/aggregation/CountAggregator.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/aggregation/MaxAggregator.java (78%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/aggregation/MinAggregator.java (78%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/aggregation/SumAggregator.java (84%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/metrics/ClientSideMetrics.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/metrics/FetchExecutionRange.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/metrics/FetchExecutionRangeAccumulator.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/metrics/QueryMetricsTextWriter.java (99%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/metrics/QueryMetricsWriter.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/metrics/SchedulingStopwatch.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/metrics/SchedulingTimeSpan.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/metrics/TextTable.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/orderbyquery/OrderByRowResult.java (86%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/query/orderbyquery/OrderbyRowComparer.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/BoolPartitionKeyComponent.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/CaseInsensitiveHashMap.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/CollectionRoutingMap.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/IPartitionKeyComponent.java (91%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/IServerIdentity.java (73%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/InMemoryCollectionRoutingMap.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/InfinityPartitionKeyComponent.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/Int128.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/LocationCache.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/LocationHelper.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/MaxNumberPartitionKeyComponent.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/MaxStringPartitionKeyComponent.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/MinNumberPartitionKeyComponent.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/MinStringPartitionKeyComponent.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/MurmurHash3_128.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/MurmurHash3_32.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/NullPartitionKeyComponent.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/NumberPartitionKeyComponent.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/PartitionKeyAndResourceTokenPair.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/PartitionKeyComponentType.java (90%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/PartitionKeyInternal.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/PartitionKeyInternalHelper.java (93%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/PartitionKeyRangeIdentity.java (98%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/Range.java (97%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/RoutingMapProvider.java (85%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/RoutingMapProviderHelper.java (96%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/StringPartitionKeyComponent.java (94%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/UInt128.java (82%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/internal/routing/UndefinedPartitionKeyComponent.java (95%) rename sdk/cosmos/azure-cosmos/src/main/java/com/azure/{data => }/cosmos/package-info.java (85%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/BridgeUtils.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/ClientUnderTestBuilder.java (82%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/ConflictTests.java (93%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/ConnectionPolicyTest.java (91%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/CosmosAsyncClientTest.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/CosmosClientExceptionTest.java (78%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/CosmosContainerTest.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/CosmosDatabaseForTest.java (99%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/CosmosDatabaseTest.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/CosmosItemTest.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/CosmosKeyCredentialTest.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/CosmosPartitionKeyTests.java (93%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/CosmosResponseValidator.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/CosmosSyncStoredProcTest.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/CosmosSyncUDFTest.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/CosmosTriggerTest.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/CosmosUserTest.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/DocumentClientTest.java (95%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/DocumentCollectionTests.java (93%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/DocumentTests.java (79%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/GatewayTestUtils.java (77%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/IncludedPathTest.java (72%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/JsonSerializableTests.java (96%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/PartitionKeyHashingTests.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/PermissionTest.java (90%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/ResourceIdTests.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/ClientRetryPolicyTest.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/ConfigsBuilder.java (83%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/ConfigsTests.java (91%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/ConsistencyTests1.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/ConsistencyTests2.java (96%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/ConsistencyTestsBase.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/DocumentQuerySpyWireContentTest.java (96%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/DocumentServiceRequestContextValidator.java (95%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/DocumentServiceRequestValidator.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/FailureValidator.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/FeedResponseListValidator.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/FeedResponseValidator.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/HttpClientUnderTestWrapper.java (89%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/LocationHelperTest.java (87%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/NetworkFailureTest.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/ParallelAsync.java (96%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/PathsHelperTest.java (99%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/RenameCollectionAwareClientRetryPolicyTest.java (94%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/ResourceResponseValidator.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/ResourceValidator.java (95%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/RetryAnalyzer.java (89%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/RetryCreateDocumentTest.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/RetryThrottleTest.java (95%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/RetryUtilsTest.java (95%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/RxDocumentClientUnderTest.java (84%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/RxDocumentServiceRequestTest.java (99%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/RxGatewayStoreModelTest.java (92%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/SessionContainerTest.java (99%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/SessionTest.java (96%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/SessionTokenTest.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/ShouldRetryValidator.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/SpyClientBuilder.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/SpyClientUnderTestFactory.java (94%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/StoreHeaderTests.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/StoreResponseBuilder.java (94%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/TestSuiteBase.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/TestUtils.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/TimeTokenTest.java (96%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/caches/AsyncCacheTest.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/AddressResolverTest.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/AddressSelectorTest.java (92%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/AddressSelectorWrapper.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/AddressValidator.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/BarrierRequestHelperTest.java (93%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/ConsistencyReaderTest.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/ConsistencyReaderUnderTest.java (91%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/ConsistencyWriterTest.java (91%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/DCDocumentCrudTest.java (89%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/EndpointMock.java (96%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/ExceptionBuilder.java (86%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/Function1WithCheckedException.java (78%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/Function2WithCheckedException.java (79%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/GatewayAddressCacheTest.java (95%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/GatewayServiceConfigurationReaderTest.java (89%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/GatewayServiceConfiguratorReaderMock.java (93%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/GlobalAddressResolverTest.java (88%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/GoneAndRetryWithRetryPolicyTest.java (91%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/HttpClientMockWrapper.java (94%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/HttpTransportClientTest.java (94%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/HttpUtilsTest.java (83%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/MultiStoreResultValidator.java (95%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/MurmurHash3_32Test.java (96%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/PartitionKeyInternalTest.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/PartitionKeyTest.java (89%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/PartitionReplicasAddressesValidator.java (91%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/QuorumReaderTest.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/ReflectionUtils.java (90%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/ReplicaAddressFactory.java (85%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/ReplicatedResourceClientPartitionSplitTest.java (92%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/ReplicatedResourceClientTest.java (83%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/RntbdTransportClientTest.java (92%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/StoreReaderDotNetTest.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/StoreReaderTest.java (96%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/StoreReaderUnderTest.java (93%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/StoreResponseTest.java (87%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/StoreResponseValidator.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/StoreResultValidator.java (96%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/TimeoutHelperTest.java (90%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/TransportClientWrapper.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/directconnectivity/WebExceptionUtilityTest.java (96%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/query/DocumentProducerTest.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/query/FeedResponseBuilder.java (88%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/query/FetcherTest.java (96%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/routing/InMemoryCollectionRoutingMapTest.java (99%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/routing/LocationCacheTest.java (96%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/routing/PartitionKeyInternalUtils.java (89%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/routing/RoutingMapProviderHelperTest.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/internal/routing/StringPartitionKeyComponentTest.java (95%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/AggregateQueryTests.java (94%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/BackPressureCrossPartitionTest.java (89%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/BackPressureTest.java (91%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ChangeFeedProcessorTest.java (94%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ChangeFeedTest.java (94%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/CollectionCrudTest.java (92%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/CollectionQueryTest.java (91%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/CosmosAsyncConflictTest.java (88%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/DatabaseCrudTest.java (91%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/DatabaseQueryTest.java (92%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/DocumentClientResourceLeakTest.java (91%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/DocumentCrudTest.java (96%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/LogLevelTest.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/MultiMasterConflictResolutionTest.java (92%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/MultiOrderByQueryTests.java (95%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/OfferQueryTest.java (90%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/OfferReadReplaceTest.java (88%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/OrderbyDocumentQueryTest.java (95%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ParallelDocumentQueryTest.java (94%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ParsingEnvTest.java (93%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/PermissionCrudTest.java (94%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/PermissionQueryTest.java (90%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ProxyHostTest.java (92%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ReadFeedCollectionsTest.java (84%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ReadFeedDatabasesTest.java (88%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ReadFeedDocumentsTest.java (89%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ReadFeedExceptionHandlingTest.java (91%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ReadFeedOffersTest.java (86%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ReadFeedPermissionsTest.java (86%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ReadFeedPkrTests.java (80%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ReadFeedStoredProceduresTest.java (87%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ReadFeedTriggersTest.java (86%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ReadFeedUdfsTest.java (88%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ReadFeedUsersTest.java (85%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/ResourceTokenTest.java (96%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/SimpleSerializationTest.java (93%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/SinglePartitionDocumentQueryTest.java (94%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/SinglePartitionReadFeedDocumentsTest.java (88%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/StoredProcedureCrudTest.java (89%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/StoredProcedureQueryTest.java (92%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/StoredProcedureUpsertReplaceTest.java (89%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/TestSuiteBase.java (95%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/TokenResolverTest.java (95%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/TopQueryTests.java (93%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/TriggerCrudTest.java (90%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/TriggerQueryTest.java (91%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/TriggerUpsertReplaceTest.java (89%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/UniqueIndexTest.java (90%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/UserCrudTest.java (92%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/UserDefinedFunctionCrudTest.java (90%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/UserDefinedFunctionQueryTest.java (91%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/UserDefinedFunctionUpsertReplaceTest.java (90%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/UserQueryTest.java (91%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/VeryLargeDocumentQueryTest.java (89%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/proxy/HttpProxyChannelInitializer.java (95%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/proxy/HttpProxyClientHandler.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/proxy/HttpProxyClientHeader.java (98%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/proxy/HttpProxyRemoteHandler.java (97%) rename sdk/cosmos/azure-cosmos/src/test/java/com/azure/{data => }/cosmos/rx/proxy/HttpProxyServer.java (97%) diff --git a/sdk/cosmos/README.md b/sdk/cosmos/README.md index db27f10b1c75..bc8c5e2e77b9 100644 --- a/sdk/cosmos/README.md +++ b/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; diff --git a/sdk/cosmos/azure-cosmos-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-benchmark/pom.xml index 95170e7e02d8..62e7ad77d07d 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/pom.xml +++ b/sdk/cosmos/azure-cosmos-benchmark/pom.xml @@ -124,7 +124,7 @@ Licensed under the MIT License. org.codehaus.mojo exec-maven-plugin - com.azure.data.cosmos.benchmark.Main + com.azure.cosmos.benchmark.Main @@ -137,7 +137,7 @@ Licensed under the MIT License. - com.azure.data.cosmos.benchmark.Main + com.azure.cosmos.benchmark.Main diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncBenchmark.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncBenchmark.java similarity index 91% rename from sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncBenchmark.java rename to sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncBenchmark.java index d88010c30e94..994115765e3a 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncBenchmark.java +++ b/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 { ArrayList> 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); diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncMixedBenchmark.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncMixedBenchmark.java similarity index 88% rename from sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncMixedBenchmark.java rename to sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncMixedBenchmark.java index 67a8eade046b..ace4a18678d8 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncMixedBenchmark.java +++ b/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; diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncQueryBenchmark.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncQueryBenchmark.java similarity index 94% rename from sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncQueryBenchmark.java rename to sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncQueryBenchmark.java index c4516f88c904..a28aec4a2841 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncQueryBenchmark.java +++ b/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; diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncQuerySinglePartitionMultiple.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncQuerySinglePartitionMultiple.java similarity index 85% rename from sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncQuerySinglePartitionMultiple.java rename to sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncQuerySinglePartitionMultiple.java index a0360aafc276..266df4f4cd5f 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncQuerySinglePartitionMultiple.java +++ b/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; diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncReadBenchmark.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncReadBenchmark.java similarity index 90% rename from sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncReadBenchmark.java rename to sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncReadBenchmark.java index 06e1287e91e1..99a81a30da04 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncReadBenchmark.java +++ b/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; diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncWriteBenchmark.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncWriteBenchmark.java similarity index 93% rename from sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncWriteBenchmark.java rename to sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncWriteBenchmark.java index 79409b2a46f4..13b19d503ceb 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncWriteBenchmark.java +++ b/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; diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/Configuration.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/Configuration.java similarity index 98% rename from sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/Configuration.java rename to sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/Configuration.java index 4c609aed9c6a..8b1362d015ff 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/Configuration.java +++ b/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; diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/DocDBUtils.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/DocDBUtils.java similarity index 78% rename from sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/DocDBUtils.java rename to sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/DocDBUtils.java index f6d51980a8df..65e2f8960883 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/DocDBUtils.java +++ b/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 { diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/Main.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/Main.java similarity index 98% rename from sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/Main.java rename to sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/Main.java index 91cdc12a9e67..9b242b06b19f 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/Main.java +++ b/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; diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/ReadMyWriteWorkflow.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/ReadMyWriteWorkflow.java similarity index 96% rename from sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/ReadMyWriteWorkflow.java rename to sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/ReadMyWriteWorkflow.java index 1c7a7a570dc9..b5e231689e12 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/ReadMyWriteWorkflow.java +++ b/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; diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/resources/log4j.properties b/sdk/cosmos/azure-cosmos-benchmark/src/main/resources/log4j.properties index 7a31b9cb1817..557b05edffac 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/main/resources/log4j.properties +++ b/sdk/cosmos/azure-cosmos-benchmark/src/main/resources/log4j.properties @@ -3,7 +3,7 @@ # 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. @@ -11,4 +11,4 @@ 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 \ No newline at end of file +log4j.appender.A1.layout.ConversionPattern=%d %5X{pid} [%t] %-5p %c - %m%n diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/data/cosmos/benchmark/QueryBuilderTest.java b/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/QueryBuilderTest.java similarity index 97% rename from sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/data/cosmos/benchmark/QueryBuilderTest.java rename to sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/QueryBuilderTest.java index b237158df609..b226a1d76f3e 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/data/cosmos/benchmark/QueryBuilderTest.java +++ b/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; diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/data/cosmos/benchmark/ReadMyWritesConsistencyTest.java b/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/ReadMyWritesConsistencyTest.java similarity index 93% rename from sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/data/cosmos/benchmark/ReadMyWritesConsistencyTest.java rename to sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/ReadMyWritesConsistencyTest.java index a782fe85d7e7..1c1248e94cec 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/data/cosmos/benchmark/ReadMyWritesConsistencyTest.java +++ b/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; diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/data/cosmos/benchmark/Utils.java b/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/Utils.java similarity index 84% rename from sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/data/cosmos/benchmark/Utils.java rename to sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/Utils.java index dca4e5770eaa..a817bebff3e1 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/data/cosmos/benchmark/Utils.java +++ b/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 { diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/data/cosmos/benchmark/WorkflowTest.java b/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/WorkflowTest.java similarity index 95% rename from sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/data/cosmos/benchmark/WorkflowTest.java rename to sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/WorkflowTest.java index 42a02f312963..3ab901d39e35 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/data/cosmos/benchmark/WorkflowTest.java +++ b/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/WorkflowTest.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.internal.AsyncDocumentClient; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.DataType; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.DocumentCollection; -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.RequestOptions; -import com.azure.data.cosmos.internal.TestConfigurations; +package com.azure.cosmos.benchmark; + +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.DataType; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.DocumentCollection; +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.RequestOptions; +import com.azure.cosmos.internal.TestConfigurations; import com.beust.jcommander.JCommander; import org.apache.commons.lang3.StringUtils; import org.testng.annotations.AfterClass; diff --git a/sdk/cosmos/azure-cosmos-examples/pom.xml b/sdk/cosmos/azure-cosmos-examples/pom.xml index f3b04de8f961..2f7475806281 100644 --- a/sdk/cosmos/azure-cosmos-examples/pom.xml +++ b/sdk/cosmos/azure-cosmos-examples/pom.xml @@ -56,7 +56,7 @@ Licensed under the MIT License. org.codehaus.mojo exec-maven-plugin - com.azure.data.cosmos.benchmark.Main + Main @@ -68,7 +68,7 @@ Licensed under the MIT License. - com.azure.data.cosmos.rx.examples.multimaster.samples.Main + com.azure.cosmos.rx.examples.multimaster.samples.Main diff --git a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/AccountSettings.java b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/AccountSettings.java similarity index 97% rename from sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/AccountSettings.java rename to sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/AccountSettings.java index c29d55586a15..e413f4eda26b 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/AccountSettings.java +++ b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/AccountSettings.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.examples; +package com.azure.cosmos.examples; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/BasicDemo.java b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/BasicDemo.java similarity index 92% rename from sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/BasicDemo.java rename to sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/BasicDemo.java index 59caf9d44f45..ece8d8b7af28 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/BasicDemo.java +++ b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/BasicDemo.java @@ -1,17 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.examples; - -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.CosmosAsyncContainer; -import com.azure.data.cosmos.CosmosAsyncDatabase; -import com.azure.data.cosmos.CosmosAsyncItem; -import com.azure.data.cosmos.CosmosAsyncItemResponse; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.CosmosContainerProperties; -import com.azure.data.cosmos.CosmosItemProperties; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; +package com.azure.cosmos.examples; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosAsyncItem; +import com.azure.cosmos.CosmosAsyncItemResponse; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosContainerProperties; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; diff --git a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java similarity index 93% rename from sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java rename to sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java index be85d69cb193..889703a28d2d 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java +++ b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java @@ -1,9 +1,19 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.examples.ChangeFeed; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; +package com.azure.cosmos.examples.ChangeFeed; + +import com.azure.cosmos.ChangeFeedProcessor; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncContainerResponse; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosContainerProperties; +import com.azure.cosmos.CosmosContainerRequestOptions; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.SerializationFormattingPolicy; +import com.azure.cosmos.CosmosAsyncClient; import org.apache.commons.lang3.RandomStringUtils; import java.time.Duration; diff --git a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/ChangeFeed/SampleConfigurations.java b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/ChangeFeed/SampleConfigurations.java similarity index 96% rename from sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/ChangeFeed/SampleConfigurations.java rename to sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/ChangeFeed/SampleConfigurations.java index 8ffa80ae06bd..32140985608b 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/ChangeFeed/SampleConfigurations.java +++ b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/ChangeFeed/SampleConfigurations.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.examples.ChangeFeed; +package com.azure.cosmos.examples.ChangeFeed; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/HelloWorldDemo.java b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/HelloWorldDemo.java similarity index 96% rename from sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/HelloWorldDemo.java rename to sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/HelloWorldDemo.java index 36b69713d784..756b31c4e009 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/HelloWorldDemo.java +++ b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/HelloWorldDemo.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.examples; +package com.azure.cosmos.examples; -import com.azure.data.cosmos.*; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; import reactor.core.publisher.Mono; import java.io.IOException; diff --git a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/ConfigurationManager.java b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/ConfigurationManager.java similarity index 82% rename from sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/ConfigurationManager.java rename to sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/ConfigurationManager.java index c6da2eceb5be..2c3b6766b8c3 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/ConfigurationManager.java +++ b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/ConfigurationManager.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples.multimaster; +package com.azure.cosmos.rx.examples.multimaster; import java.util.Properties; diff --git a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/Helpers.java b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/Helpers.java similarity index 91% rename from sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/Helpers.java rename to sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/Helpers.java index 92f7f19ccc00..f8d97bbee7ef 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/Helpers.java +++ b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/Helpers.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples.multimaster; +package com.azure.cosmos.rx.examples.multimaster; -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.ResourceResponse; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/ConflictWorker.java b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/ConflictWorker.java similarity index 97% rename from sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/ConflictWorker.java rename to sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/ConflictWorker.java index 4615dc7e2f10..c8531dcfd332 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/ConflictWorker.java +++ b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/ConflictWorker.java @@ -1,23 +1,23 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples.multimaster.samples; - -import com.azure.data.cosmos.AccessCondition; -import com.azure.data.cosmos.AccessConditionType; -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.internal.Conflict; -import com.azure.data.cosmos.ConflictResolutionPolicy; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.RequestOptions; -import com.azure.data.cosmos.internal.ResourceResponse; -import com.azure.data.cosmos.internal.StoredProcedure; -import com.azure.data.cosmos.rx.examples.multimaster.Helpers; +package com.azure.cosmos.rx.examples.multimaster.samples; + +import com.azure.cosmos.AccessCondition; +import com.azure.cosmos.AccessConditionType; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.internal.Conflict; +import com.azure.cosmos.ConflictResolutionPolicy; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.StoredProcedure; +import com.azure.cosmos.rx.examples.multimaster.Helpers; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/Main.java b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/Main.java similarity index 91% rename from sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/Main.java rename to sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/Main.java index 2dcc08cd0c0d..becfb12f1a6a 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/Main.java +++ b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/Main.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples.multimaster.samples; +package com.azure.cosmos.rx.examples.multimaster.samples; -import com.azure.data.cosmos.rx.examples.multimaster.ConfigurationManager; +import com.azure.cosmos.rx.examples.multimaster.ConfigurationManager; import org.apache.commons.io.IOUtils; import java.io.FileInputStream; diff --git a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/MultiMasterScenario.java b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/MultiMasterScenario.java similarity index 95% rename from sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/MultiMasterScenario.java rename to sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/MultiMasterScenario.java index 34b971fdfd8f..3b9e4e4cdef3 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/MultiMasterScenario.java +++ b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/MultiMasterScenario.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples.multimaster.samples; +package com.azure.cosmos.rx.examples.multimaster.samples; -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.rx.examples.multimaster.ConfigurationManager; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.rx.examples.multimaster.ConfigurationManager; import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/Worker.java b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/Worker.java similarity index 94% rename from sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/Worker.java rename to sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/Worker.java index 850a207bcbb0..439d9c227bce 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/Worker.java +++ b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/Worker.java @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples.multimaster.samples; +package com.azure.cosmos.rx.examples.multimaster.samples; -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos-examples/src/main/resources/log4j.properties b/sdk/cosmos/azure-cosmos-examples/src/main/resources/log4j.properties index a8f16e5dee31..08400d7f9811 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/main/resources/log4j.properties +++ b/sdk/cosmos/azure-cosmos-examples/src/main/resources/log4j.properties @@ -5,12 +5,12 @@ log4j.rootLogger=WARN, A1 log4j.category.io.netty=INFO log4j.category.io.reactivex=INFO -log4j.category.com.azure.data.cosmos.rx.examples.multimaster.samples.ConflictWorker=INFO -log4j.category.com.azure.data.cosmos.rx.examples.multimaster.samples.Main=INFO -log4j.category.com.azure.data.cosmos.rx.examples.multimaster.samples.Worker=INFO -log4j.category.com.azure.data.cosmos.rx.examples.multimaster.samples.MultiMasterScenario=INFO -log4j.category.com.azure.data.cosmos.rx.examples.multimaster.ConfigurationManager=INFO -log4j.category.com.azure.data.cosmos.rx.examples.multimaster.Helpers=INFO +log4j.category.ConflictWorker=INFO +log4j.category.Main=INFO +log4j.category.Worker=INFO +log4j.category.MultiMasterScenario=INFO +log4j.category.ConfigurationManager=INFO +log4j.category.Helpers=INFO # A1 is set to be a ConsoleAppender. log4j.appender.A1=org.apache.log4j.ConsoleAppender diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/DocumentClientTest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/DocumentClientTest.java similarity index 94% rename from sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/DocumentClientTest.java rename to sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/DocumentClientTest.java index 00c9079b7ad8..ea162a62c766 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/DocumentClientTest.java +++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/DocumentClientTest.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.AsyncDocumentClient; import com.google.common.base.Strings; import org.testng.ITest; import org.testng.annotations.AfterMethod; diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java similarity index 94% rename from sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java rename to sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java index d84194fb5c58..6d5a40e9d895 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java +++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java @@ -1,24 +1,24 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.DataType; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.DocumentClientTest; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.FeedResponse; -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.RequestOptions; -import com.azure.data.cosmos.internal.ResourceResponse; +package com.azure.cosmos.rx.examples; + +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.DataType; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.DocumentClientTest; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.FeedResponse; +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.RequestOptions; +import com.azure.cosmos.internal.ResourceResponse; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -61,7 +61,7 @@ *

* To Modify the Collection's throughput after it has been created, you need to * update the corresponding Offer. Please see - * {@see com.azure.data.cosmos.rx.examples.OfferCRUDAsyncAPITest#testUpdateOffer()} + * {@see com.azure.cosmos.rx.examples.OfferCRUDAsyncAPITest#testUpdateOffer()} */ public class CollectionCRUDAsyncAPITest extends DocumentClientTest { diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/ConflictAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/ConflictAPITest.java similarity index 89% rename from sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/ConflictAPITest.java rename to sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/ConflictAPITest.java index e20be5ac7b18..326bf781a5ab 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/ConflictAPITest.java +++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/ConflictAPITest.java @@ -1,20 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.internal.Conflict; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.DocumentClientTest; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.internal.HttpConstants; +package com.azure.cosmos.rx.examples; + +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.Conflict; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.DocumentClientTest; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.internal.HttpConstants; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Ignore; diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/DatabaseCRUDAsyncAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DatabaseCRUDAsyncAPITest.java similarity index 96% rename from sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/DatabaseCRUDAsyncAPITest.java rename to sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DatabaseCRUDAsyncAPITest.java index 300f0c090cdb..5b1b5bd77959 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/DatabaseCRUDAsyncAPITest.java +++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DatabaseCRUDAsyncAPITest.java @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.DocumentClientTest; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.internal.ResourceResponse; +package com.azure.cosmos.rx.examples; + +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.DocumentClientTest; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.ResourceResponse; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/DocumentCRUDAsyncAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DocumentCRUDAsyncAPITest.java similarity index 96% rename from sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/DocumentCRUDAsyncAPITest.java rename to sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DocumentCRUDAsyncAPITest.java index 11bea5cee487..54b4cc089699 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/DocumentCRUDAsyncAPITest.java +++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DocumentCRUDAsyncAPITest.java @@ -1,23 +1,24 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.DocumentClientTest; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.internal.RequestOptions; -import com.azure.data.cosmos.internal.ResourceResponse; +package com.azure.cosmos.rx.examples; + +import com.azure.cosmos.DocumentClientTest; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.DocumentClientTest; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.ResourceResponse; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/DocumentQueryAsyncAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DocumentQueryAsyncAPITest.java similarity index 95% rename from sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/DocumentQueryAsyncAPITest.java rename to sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DocumentQueryAsyncAPITest.java index 5d812547d30a..1d999980ca05 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/DocumentQueryAsyncAPITest.java +++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DocumentQueryAsyncAPITest.java @@ -1,23 +1,23 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.DocumentClientTest; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.SqlParameterList; -import com.azure.data.cosmos.internal.RequestOptions; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.SqlQuerySpec; -import com.azure.data.cosmos.internal.HttpConstants; +package com.azure.cosmos.rx.examples; + +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.DocumentClientTest; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.SqlParameterList; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.Resource; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.HttpConstants; import org.apache.commons.lang3.RandomStringUtils; import org.reactivestreams.Subscription; import org.testng.annotations.AfterClass; diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/InMemoryGroupbyTest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/InMemoryGroupbyTest.java similarity index 90% rename from sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/InMemoryGroupbyTest.java rename to sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/InMemoryGroupbyTest.java index 0f5fd7eabfc8..f9e389cdf470 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/InMemoryGroupbyTest.java +++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/InMemoryGroupbyTest.java @@ -1,20 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.DocumentClientTest; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.SqlParameter; -import com.azure.data.cosmos.SqlParameterList; -import com.azure.data.cosmos.SqlQuerySpec; +package com.azure.cosmos.rx.examples; + +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.DocumentClientTest; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.SqlParameter; +import com.azure.cosmos.SqlParameterList; +import com.azure.cosmos.SqlQuerySpec; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Ignore; diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/OfferCRUDAsyncAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/OfferCRUDAsyncAPITest.java similarity index 88% rename from sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/OfferCRUDAsyncAPITest.java rename to sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/OfferCRUDAsyncAPITest.java index 4a1781a02991..7182cc5fef8f 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/OfferCRUDAsyncAPITest.java +++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/OfferCRUDAsyncAPITest.java @@ -1,23 +1,23 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.DataType; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.DocumentClientTest; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.IncludedPath; -import com.azure.data.cosmos.Index; -import com.azure.data.cosmos.IndexingPolicy; -import com.azure.data.cosmos.internal.Offer; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.internal.RequestOptions; +package com.azure.cosmos.rx.examples; + +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.DataType; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.DocumentClientTest; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.IncludedPath; +import com.azure.cosmos.Index; +import com.azure.cosmos.IndexingPolicy; +import com.azure.cosmos.internal.Offer; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.internal.RequestOptions; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/StoredProcedureAsyncAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/StoredProcedureAsyncAPITest.java similarity index 92% rename from sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/StoredProcedureAsyncAPITest.java rename to sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/StoredProcedureAsyncAPITest.java index 101b5d229334..e304447cf29f 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/StoredProcedureAsyncAPITest.java +++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/StoredProcedureAsyncAPITest.java @@ -1,25 +1,25 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.DataType; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.DocumentClientTest; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.IncludedPath; -import com.azure.data.cosmos.Index; -import com.azure.data.cosmos.IndexingPolicy; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.internal.RequestOptions; -import com.azure.data.cosmos.internal.StoredProcedure; -import com.azure.data.cosmos.internal.HttpConstants; +package com.azure.cosmos.rx.examples; + +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.DataType; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.DocumentClientTest; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.IncludedPath; +import com.azure.cosmos.Index; +import com.azure.cosmos.IndexingPolicy; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.StoredProcedure; +import com.azure.cosmos.internal.HttpConstants; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/TestConfigurations.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/TestConfigurations.java similarity index 97% rename from sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/TestConfigurations.java rename to sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/TestConfigurations.java index fef11762d903..90fdd9560c97 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/TestConfigurations.java +++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/TestConfigurations.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples; +package com.azure.cosmos.rx.examples; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/TokenResolverTest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/TokenResolverTest.java similarity index 94% rename from sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/TokenResolverTest.java rename to sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/TokenResolverTest.java index 66e2b6bb3485..f37ce94ff6e4 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/TokenResolverTest.java +++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/TokenResolverTest.java @@ -1,25 +1,25 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosResourceType; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.DocumentClientTest; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.internal.Permission; -import com.azure.data.cosmos.PermissionMode; -import com.azure.data.cosmos.internal.RequestOptions; -import com.azure.data.cosmos.internal.ResourceResponse; -import com.azure.data.cosmos.TokenResolver; -import com.azure.data.cosmos.internal.User; +package com.azure.cosmos.rx.examples; + +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosResourceType; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.DocumentClientTest; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.internal.Permission; +import com.azure.cosmos.PermissionMode; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.TokenResolver; +import com.azure.cosmos.internal.User; import com.google.common.collect.ImmutableMap; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/UniqueIndexAsyncAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/UniqueIndexAsyncAPITest.java similarity index 86% rename from sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/UniqueIndexAsyncAPITest.java rename to sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/UniqueIndexAsyncAPITest.java index c683106766d5..5b8ace5a6f78 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/UniqueIndexAsyncAPITest.java +++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/UniqueIndexAsyncAPITest.java @@ -1,20 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.DocumentClientTest; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.UniqueKey; -import com.azure.data.cosmos.UniqueKeyPolicy; -import com.azure.data.cosmos.internal.ResourceResponse; +package com.azure.cosmos.rx.examples; + +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.DocumentClientTest; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.UniqueKey; +import com.azure.cosmos.UniqueKeyPolicy; +import com.azure.cosmos.internal.ResourceResponse; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import io.reactivex.subscribers.TestSubscriber; diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/Utils.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/Utils.java similarity index 83% rename from sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/Utils.java rename to sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/Utils.java index 8da14c82cecd..325888e2b6c7 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/data/cosmos/rx/examples/Utils.java +++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/Utils.java @@ -1,19 +1,19 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.examples; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.ConnectionMode; -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.rx.examples; + +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.ConnectionMode; +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 org.testng.annotations.AfterSuite; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/AccessCondition.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/AccessCondition.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/AccessCondition.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/AccessCondition.java index d4760a0d128b..a8c033768c71 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/AccessCondition.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/AccessCondition.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * Represents a set of access conditions to be used for operations against the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/AccessConditionType.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/AccessConditionType.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/AccessConditionType.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/AccessConditionType.java index 69c3419f5b70..ac7b6e0d54b8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/AccessConditionType.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/AccessConditionType.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * Specifies the set of access condition types that can be used for operations in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/BadRequestException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/BadRequestException.java similarity index 82% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/BadRequestException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/BadRequestException.java index 2c0531c4acbf..ec0bc2e44844 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/BadRequestException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/BadRequestException.java @@ -1,11 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; import java.net.URI; import java.util.HashMap; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/BridgeInternal.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/BridgeInternal.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/BridgeInternal.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/BridgeInternal.java index c66c57539f81..99e0cf6eaa9e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/BridgeInternal.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/BridgeInternal.java @@ -1,22 +1,36 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; - -import com.azure.data.cosmos.internal.Configs; -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.QueryMetrics; -import com.azure.data.cosmos.internal.ReplicationPolicy; -import com.azure.data.cosmos.internal.ResourceResponse; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.RxDocumentServiceResponse; -import com.azure.data.cosmos.internal.StoredProcedureResponse; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.directconnectivity.StoreResult; -import com.azure.data.cosmos.internal.query.metrics.ClientSideMetrics; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternal; +package com.azure.cosmos; + +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.QueryMetrics; +import com.azure.cosmos.internal.ReplicationPolicy; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.RxDocumentServiceResponse; +import com.azure.cosmos.internal.StoredProcedureResponse; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.directconnectivity.StoreResult; +import com.azure.cosmos.internal.query.metrics.ClientSideMetrics; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.QueryMetrics; +import com.azure.cosmos.internal.ReplicationPolicy; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.RxDocumentServiceResponse; +import com.azure.cosmos.internal.StoredProcedureResponse; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.directconnectivity.StoreResult; +import com.azure.cosmos.internal.query.metrics.ClientSideMetrics; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -32,11 +46,11 @@ import java.util.Set; import java.util.concurrent.ConcurrentMap; -import static com.azure.data.cosmos.internal.Constants.QueryExecutionContext.INCREMENTAL_FEED_HEADER_VALUE; +import static com.azure.cosmos.internal.Constants.QueryExecutionContext.INCREMENTAL_FEED_HEADER_VALUE; /** * This is meant to be used only internally as a bridge access to classes in - * com.azure.data.cosmos + * com.azure.cosmos **/ public class BridgeInternal { @@ -117,7 +131,7 @@ public static Map getFeedHeaders(ChangeFeedOptions options) { headers.put(HttpConstants.HttpHeaders.IF_NONE_MATCH, ifNoneMatchValue); } - headers.put(HttpConstants.HttpHeaders.A_IM, INCREMENTAL_FEED_HEADER_VALUE); + headers.put(HttpConstants.HttpHeaders.A_IM, Constants.QueryExecutionContext.INCREMENTAL_FEED_HEADER_VALUE); return headers; } @@ -279,7 +293,7 @@ public static void putQueryMetricsIntoMap(FeedResponse r } public static QueryMetrics createQueryMetricsFromDelimitedStringAndClientSideMetrics( - String queryMetricsDelimitedString, ClientSideMetrics clientSideMetrics, String activityId) { + String queryMetricsDelimitedString, ClientSideMetrics clientSideMetrics, String activityId) { return QueryMetrics.createFromDelimitedStringAndClientSideMetrics(queryMetricsDelimitedString, clientSideMetrics, activityId); } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ChangeFeedOptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ChangeFeedOptions.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ChangeFeedOptions.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ChangeFeedOptions.java index c957404fecb6..e7493cadf20c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ChangeFeedOptions.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ChangeFeedOptions.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.PartitionKeyRange; import java.time.OffsetDateTime; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ChangeFeedProcessor.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ChangeFeedProcessor.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ChangeFeedProcessor.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ChangeFeedProcessor.java index 7b19939dd9ed..e7712460f006 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ChangeFeedProcessor.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ChangeFeedProcessor.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserver; -import com.azure.data.cosmos.internal.changefeed.implementation.ChangeFeedProcessorBuilderImpl; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserver; +import com.azure.cosmos.internal.changefeed.implementation.ChangeFeedProcessorBuilderImpl; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserver; +import com.azure.cosmos.internal.changefeed.implementation.ChangeFeedProcessorBuilderImpl; import reactor.core.publisher.Mono; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ChangeFeedProcessorOptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ChangeFeedProcessorOptions.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ChangeFeedProcessorOptions.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ChangeFeedProcessorOptions.java index fcca233c881d..bd2c167c81e3 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ChangeFeedProcessorOptions.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ChangeFeedProcessorOptions.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import java.time.Duration; import java.time.OffsetDateTime; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ClientSideRequestStatistics.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ClientSideRequestStatistics.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ClientSideRequestStatistics.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ClientSideRequestStatistics.java index 1247eba3d749..9eba97c6cec2 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ClientSideRequestStatistics.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ClientSideRequestStatistics.java @@ -1,12 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; - -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.Utils; -import com.azure.data.cosmos.internal.directconnectivity.StoreResult; +package com.azure.cosmos; + +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.directconnectivity.StoreResult; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.directconnectivity.StoreResult; import org.apache.commons.lang3.StringUtils; import java.net.URI; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CommonsBridgeInternal.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CommonsBridgeInternal.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CommonsBridgeInternal.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CommonsBridgeInternal.java index 400c157f77cf..b01070e75855 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CommonsBridgeInternal.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CommonsBridgeInternal.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; public class CommonsBridgeInternal { public static boolean isV2(PartitionKeyDefinition pkd) { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePath.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CompositePath.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePath.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CompositePath.java index a8b0731e3dc2..3c29ea3d05b7 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePath.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CompositePath.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; import org.apache.commons.lang3.StringUtils; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePathSortOrder.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CompositePathSortOrder.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePathSortOrder.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CompositePathSortOrder.java index 1c012b4ecdbe..75c4ae30306a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePathSortOrder.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CompositePathSortOrder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * Represents the sorting order for a path in a composite index, for a diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConflictException.java similarity index 81% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConflictException.java index 36bf1d13961b..9d49739bc678 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConflictException.java @@ -1,11 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; import java.util.Map; @@ -57,4 +61,4 @@ public ConflictException(String message, HttpHeaders headers, String requestUriS HttpConstants.StatusCodes.CONFLICT, requestUriString); } -} \ No newline at end of file +} diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionMode.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConflictResolutionMode.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionMode.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConflictResolutionMode.java index c25e32db66f8..5ca5b51ea3fa 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionMode.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConflictResolutionMode.java @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Conflict; -import com.azure.data.cosmos.internal.StoredProcedure; +import com.azure.cosmos.internal.Conflict; +import com.azure.cosmos.internal.StoredProcedure; +import com.azure.cosmos.internal.Conflict; +import com.azure.cosmos.internal.StoredProcedure; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.WordUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConflictResolutionPolicy.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConflictResolutionPolicy.java index bfb4894d468e..0dc74f94c581 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConflictResolutionPolicy.java @@ -1,13 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.internal.StoredProcedure; -import com.azure.data.cosmos.internal.Strings; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.StoredProcedure; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.StoredProcedure; +import com.azure.cosmos.internal.Strings; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionMode.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConnectionMode.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionMode.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConnectionMode.java index 5e31532fadf5..ab421059674c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionMode.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConnectionMode.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * Represents the connection mode to be used by the client in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConnectionPolicy.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConnectionPolicy.java index e33cc2df291e..ed7607ac4e56 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConnectionPolicy.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import java.net.InetSocketAddress; import java.util.Collections; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyLevel.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConsistencyLevel.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyLevel.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConsistencyLevel.java index 98b848889147..de83784cd3f4 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyLevel.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConsistencyLevel.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.WordUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConsistencyPolicy.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConsistencyPolicy.java index 1fa944c8e8df..78848c1b9e3c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ConsistencyPolicy.java @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; import org.apache.commons.lang3.StringUtils; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncClient.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java index fbf8efe47b60..8aa571cd2910 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java @@ -1,14 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.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; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.Permission; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdMetrics; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.Permission; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdMetrics; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.Permission; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdMetrics; import io.micrometer.core.instrument.MeterRegistry; import reactor.core.Exceptions; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncConflict.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncConflict.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncConflict.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncConflict.java index fde73bbc78b7..6c87c7d4cc9c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncConflict.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncConflict.java @@ -1,11 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.RequestOptions; import reactor.core.publisher.Mono; -import static com.azure.data.cosmos.internal.Paths.CONFLICTS_PATH_SEGMENT; +import static com.azure.cosmos.internal.Paths.CONFLICTS_PATH_SEGMENT; /** * Read and delete conflicts @@ -88,7 +90,7 @@ public Mono delete(CosmosConflictRequestOptions opt } String URIPathSegment() { - return CONFLICTS_PATH_SEGMENT; + return Paths.CONFLICTS_PATH_SEGMENT; } String parentLink() { 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/cosmos/CosmosAsyncConflictResponse.java similarity index 85% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncConflictResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncConflictResponse.java index 9beee6b6a2be..f274e5369e99 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncConflictResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncConflictResponse.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Conflict; -import com.azure.data.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.Conflict; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.Conflict; +import com.azure.cosmos.internal.ResourceResponse; public class CosmosAsyncConflictResponse extends CosmosResponse { private CosmosAsyncContainer container; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncContainer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncContainer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java index 526aab0a1b98..55ddb444939c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncContainer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java @@ -1,15 +1,19 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; - -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.Offer; -import com.azure.data.cosmos.internal.Paths; -import com.azure.data.cosmos.internal.RequestOptions; +package com.azure.cosmos; + +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.Offer; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.Offer; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.RequestOptions; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import static com.azure.data.cosmos.Resource.validateResource; +import static com.azure.cosmos.Resource.validateResource; /** * Provides methods for reading, deleting, and replacing existing Containers. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncContainerResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainerResponse.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncContainerResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainerResponse.java index a95620d54435..d8c4e1bf025e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncContainerResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainerResponse.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.ResourceResponse; public class CosmosAsyncContainerResponse extends CosmosResponse { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncDatabase.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabase.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncDatabase.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabase.java index 8e7a43f029a6..f4bd7b2c091e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncDatabase.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabase.java @@ -1,17 +1,21 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.Offer; -import com.azure.data.cosmos.internal.Paths; +package com.azure.cosmos; + +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.Offer; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.Offer; +import com.azure.cosmos.internal.Paths; import org.apache.commons.lang3.StringUtils; import reactor.core.Exceptions; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import static com.azure.data.cosmos.Resource.validateResource; +import static com.azure.cosmos.Resource.validateResource; /** * Perform read and delete databases, update database throughput, and perform operations on child resources diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncDatabaseResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabaseResponse.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncDatabaseResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabaseResponse.java index 053c577105ac..b8d85f780076 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncDatabaseResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabaseResponse.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.ResourceResponse; public class CosmosAsyncDatabaseResponse extends CosmosResponse{ private CosmosAsyncDatabase database; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncItem.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncItem.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncItem.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncItem.java index ecc9f1f80fa3..f92fd251cef8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncItem.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncItem.java @@ -1,10 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.internal.Paths; -import com.azure.data.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.RequestOptions; import reactor.core.publisher.Mono; public class CosmosAsyncItem { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncItemResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncItemResponse.java similarity index 82% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncItemResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncItemResponse.java index 0e957344aeae..4d4a364e03b7 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncItemResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncItemResponse.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.ResourceResponse; public class CosmosAsyncItemResponse extends CosmosResponse{ private CosmosAsyncItem itemClient; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncPermission.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncPermission.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncPermission.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncPermission.java index 2e1cf517b4d5..be008f502810 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncPermission.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncPermission.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Paths; -import com.azure.data.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.RequestOptions; import reactor.core.publisher.Mono; public class CosmosAsyncPermission { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncPermissionResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncPermissionResponse.java similarity index 83% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncPermissionResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncPermissionResponse.java index ae9bf1292935..34e1ab69a3f0 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncPermissionResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncPermissionResponse.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Permission; -import com.azure.data.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.Permission; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.Permission; +import com.azure.cosmos.internal.ResourceResponse; public class CosmosAsyncPermissionResponse extends CosmosResponse { CosmosAsyncPermission permissionClient; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncScripts.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncScripts.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncScripts.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncScripts.java index f8c61bdd1f38..cbde9c797058 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncScripts.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncScripts.java @@ -1,10 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.StoredProcedure; -import com.azure.data.cosmos.internal.Trigger; -import com.azure.data.cosmos.internal.UserDefinedFunction; +import com.azure.cosmos.internal.StoredProcedure; +import com.azure.cosmos.internal.Trigger; +import com.azure.cosmos.internal.UserDefinedFunction; +import com.azure.cosmos.internal.StoredProcedure; +import com.azure.cosmos.internal.Trigger; +import com.azure.cosmos.internal.UserDefinedFunction; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncStoredProcedure.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncStoredProcedure.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncStoredProcedure.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncStoredProcedure.java index e0986c586717..d67d7dba4ec4 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncStoredProcedure.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncStoredProcedure.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Paths; -import com.azure.data.cosmos.internal.StoredProcedure; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.StoredProcedure; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.StoredProcedure; import reactor.core.publisher.Mono; public class CosmosAsyncStoredProcedure { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncStoredProcedureResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncStoredProcedureResponse.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncStoredProcedureResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncStoredProcedureResponse.java index d1fa533eda1c..503bd6c6a5ec 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncStoredProcedureResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncStoredProcedureResponse.java @@ -1,10 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.ResourceResponse; -import com.azure.data.cosmos.internal.StoredProcedure; -import com.azure.data.cosmos.internal.StoredProcedureResponse; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.StoredProcedure; +import com.azure.cosmos.internal.StoredProcedureResponse; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.StoredProcedure; +import com.azure.cosmos.internal.StoredProcedureResponse; public class CosmosAsyncStoredProcedureResponse extends CosmosResponse { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncTrigger.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncTrigger.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncTrigger.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncTrigger.java index 17b5923de64a..55f0d8807e32 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncTrigger.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncTrigger.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Paths; -import com.azure.data.cosmos.internal.Trigger; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.Trigger; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.Trigger; import reactor.core.publisher.Mono; public class CosmosAsyncTrigger { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncTriggerResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncTriggerResponse.java similarity index 84% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncTriggerResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncTriggerResponse.java index ccecc5d131dc..6638192ca59e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncTriggerResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncTriggerResponse.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.ResourceResponse; -import com.azure.data.cosmos.internal.Trigger; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.Trigger; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.Trigger; public class CosmosAsyncTriggerResponse extends CosmosResponse { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncUser.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUser.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncUser.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUser.java index d96443c90183..b6aecf732369 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncUser.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUser.java @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Paths; -import com.azure.data.cosmos.internal.Permission; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.Permission; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.Permission; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncUserDefinedFunction.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUserDefinedFunction.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncUserDefinedFunction.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUserDefinedFunction.java index 8b1326b06ff6..3b9512e6da1a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncUserDefinedFunction.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUserDefinedFunction.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Paths; -import com.azure.data.cosmos.internal.UserDefinedFunction; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.UserDefinedFunction; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.UserDefinedFunction; import reactor.core.publisher.Mono; public class CosmosAsyncUserDefinedFunction { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncUserDefinedFunctionResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUserDefinedFunctionResponse.java similarity index 85% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncUserDefinedFunctionResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUserDefinedFunctionResponse.java index 72dc995db3d1..4b8d0ea26304 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncUserDefinedFunctionResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUserDefinedFunctionResponse.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.ResourceResponse; -import com.azure.data.cosmos.internal.UserDefinedFunction; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.UserDefinedFunction; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.UserDefinedFunction; public class CosmosAsyncUserDefinedFunctionResponse extends CosmosResponse { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncUserResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUserResponse.java similarity index 82% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncUserResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUserResponse.java index f107d6d543ef..52db5433bb1e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncUserResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUserResponse.java @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.ResourceResponse; -import com.azure.data.cosmos.internal.User; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.User; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.User; public class CosmosAsyncUserResponse extends CosmosResponse { private CosmosAsyncUser user; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosBridgeInternal.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosBridgeInternal.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosBridgeInternal.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosBridgeInternal.java index fb1a552167e1..b53b63057d8b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosBridgeInternal.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosBridgeInternal.java @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.DocumentCollection; import reactor.core.publisher.Mono; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClient.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosClient.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClient.java index 7403a86e48b3..7a2fddac33bf 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClient.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import com.azure.core.implementation.annotation.ServiceClient; import reactor.core.Exceptions; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosClientBuilder.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientBuilder.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosClientBuilder.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientBuilder.java index d83ac68177df..500cae3db078 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosClientBuilder.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientBuilder.java @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import com.azure.core.implementation.annotation.ServiceClientBuilder; -import com.azure.data.cosmos.internal.Configs; -import com.azure.data.cosmos.internal.Permission; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.Permission; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.Permission; import org.apache.commons.lang3.StringUtils; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosClientException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientException.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosClientException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientException.java index f2269bef9210..bcb14a5b0160 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosClientException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientException.java @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.HttpConstants; import org.apache.commons.lang3.StringUtils; import java.net.URI; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosConflictProperties.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosConflictProperties.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosConflictProperties.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosConflictProperties.java index 627a91050381..712fc9c90a8d 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosConflictProperties.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosConflictProperties.java @@ -1,10 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Conflict; -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.Strings; +import com.azure.cosmos.internal.Conflict; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.Conflict; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Strings; import java.lang.reflect.InvocationTargetException; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosConflictRequestOptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosConflictRequestOptions.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosConflictRequestOptions.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosConflictRequestOptions.java index d26dc5ef2b7f..86316de8f458 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosConflictRequestOptions.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosConflictRequestOptions.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.RequestOptions; public class CosmosConflictRequestOptions { private AccessCondition accessCondition; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainer.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainer.java index 4d38f529c2e6..f585306b3b18 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainer.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import reactor.core.Exceptions; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainerProperties.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainerProperties.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainerProperties.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainerProperties.java index a7c8041c0a89..0c0149add1e0 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainerProperties.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainerProperties.java @@ -1,10 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; - -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.internal.ResourceResponse; +package com.azure.cosmos; + +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.ResourceResponse; import java.util.ArrayList; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainerRequestOptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainerRequestOptions.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainerRequestOptions.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainerRequestOptions.java index a4b1eb1ba59b..7794f5c4897a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainerRequestOptions.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainerRequestOptions.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.RequestOptions; /** * Encapsulates options that can be specified for a request issued to cosmos container. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainerResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainerResponse.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainerResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainerResponse.java index b702bb56eadf..e56089dfdfbe 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainerResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainerResponse.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * The synchronous cosmos container response diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosDatabase.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabase.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosDatabase.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabase.java index b94d729f0dd4..934fa6cad8cc 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosDatabase.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabase.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import reactor.core.Exceptions; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosDatabaseProperties.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabaseProperties.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosDatabaseProperties.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabaseProperties.java index eb3652bcad5a..ec8dc6d7efd5 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosDatabaseProperties.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabaseProperties.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.ResourceResponse; import java.util.List; import java.util.stream.Collectors; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosDatabaseRequestOptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabaseRequestOptions.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosDatabaseRequestOptions.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabaseRequestOptions.java index 679a15a1f6f0..9a31754be525 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosDatabaseRequestOptions.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabaseRequestOptions.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.RequestOptions; /** * Encapsulates options that can be specified for a request issued to cosmos database. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosDatabaseResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabaseResponse.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosDatabaseResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabaseResponse.java index a92205d2b64e..65806c0d3b49 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosDatabaseResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabaseResponse.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; public class CosmosDatabaseResponse extends CosmosResponse { private final CosmosAsyncDatabaseResponse responseWrapper; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosError.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosError.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosError.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosError.java index ee12c61cef51..d846c0b1b961 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosError.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosError.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; import com.fasterxml.jackson.databind.node.ObjectNode; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosItem.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosItem.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosItem.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosItem.java index b71374d9e8bd..94c823c1cc9a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosItem.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosItem.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * The Cosmos synchronous item. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosItemProperties.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosItemProperties.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosItemProperties.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosItemProperties.java index b91234a6f058..21dcc62a2ec8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosItemProperties.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosItemProperties.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.Utils; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosItemRequestOptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosItemRequestOptions.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosItemRequestOptions.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosItemRequestOptions.java index 757fbf27ef9a..2896abdc365c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosItemRequestOptions.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosItemRequestOptions.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.RequestOptions; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosItemResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosItemResponse.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosItemResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosItemResponse.java index 7924b35dd7a4..7c8fe74a0cd5 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosItemResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosItemResponse.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; public class CosmosItemResponse extends CosmosResponse { private final CosmosAsyncItemResponse responseWrapper; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosKeyCredential.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosKeyCredential.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosKeyCredential.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosKeyCredential.java index 4e82cfdab18e..53c4bc8dfd18 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosKeyCredential.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosKeyCredential.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * Cosmos Key Credential is used to store key credentials, in order to support dynamic key rotation. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosPermissionProperties.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosPermissionProperties.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosPermissionProperties.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosPermissionProperties.java index 058029500a05..9575b1f01a10 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosPermissionProperties.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosPermissionProperties.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.Permission; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Permission; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Permission; import org.apache.commons.lang3.StringUtils; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosPermissionRequestOptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosPermissionRequestOptions.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosPermissionRequestOptions.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosPermissionRequestOptions.java index c95ab001dd35..ccad24e07e51 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosPermissionRequestOptions.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosPermissionRequestOptions.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.RequestOptions; /** * Contains the request options of CosmosAsyncPermission diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosResourceType.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosResourceType.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosResourceType.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosResourceType.java index 3683077ed036..0f3ae7aeb749 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosResourceType.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosResourceType.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * Resource types in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosResponse.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosResponse.java index 331691e59ffa..4007509dd180 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosResponse.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.ResourceResponse; -import com.azure.data.cosmos.internal.StoredProcedureResponse; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.StoredProcedureResponse; import java.time.Duration; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosResponseDiagnostics.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosResponseDiagnostics.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosResponseDiagnostics.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosResponseDiagnostics.java index cae7015a4bd4..a422e1153ba8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosResponseDiagnostics.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosResponseDiagnostics.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import java.time.Duration; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosScripts.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosScripts.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosScripts.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosScripts.java index 303c98947c40..3d612eec8d32 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosScripts.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosScripts.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import reactor.core.Exceptions; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosStoredProcedure.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedure.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosStoredProcedure.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedure.java index 9aa57b3366e0..ddf73393b79d 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosStoredProcedure.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedure.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * The type Cosmos sync stored procedure. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosStoredProcedureProperties.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedureProperties.java similarity index 85% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosStoredProcedureProperties.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedureProperties.java index 1ad49015c1f4..2c48272fa3ad 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosStoredProcedureProperties.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedureProperties.java @@ -1,10 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.ResourceResponse; -import com.azure.data.cosmos.internal.StoredProcedure; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.StoredProcedure; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.StoredProcedure; import java.util.List; import java.util.stream.Collectors; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosStoredProcedureRequestOptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedureRequestOptions.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosStoredProcedureRequestOptions.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedureRequestOptions.java index e23bcff76e31..570fafa72f30 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosStoredProcedureRequestOptions.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedureRequestOptions.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.RequestOptions; /** * Encapsulates options that can be specified for a request issued to cosmos stored procedure. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosStoredProcedureResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedureResponse.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosStoredProcedureResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedureResponse.java index d694b83e6481..e019e4ea4ad7 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosStoredProcedureResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedureResponse.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosTrigger.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTrigger.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosTrigger.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTrigger.java index bca385756101..4fb6da42a52a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosTrigger.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTrigger.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * The type Cosmos sync trigger. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosTriggerProperties.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTriggerProperties.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosTriggerProperties.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTriggerProperties.java index 32a7322f8c33..b1eae8cee9d3 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosTriggerProperties.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTriggerProperties.java @@ -1,10 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.ResourceResponse; -import com.azure.data.cosmos.internal.Trigger; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.Trigger; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.Trigger; import org.apache.commons.lang3.StringUtils; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosTriggerResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTriggerResponse.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosTriggerResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTriggerResponse.java index 4b56edfaf9ad..390b8136bc98 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosTriggerResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTriggerResponse.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * The type Cosmos sync trigger response. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUser.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUser.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUser.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUser.java index 112b22093173..83a577188c32 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUser.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUser.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * The type Cosmos sync user. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUserDefinedFunction.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserDefinedFunction.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUserDefinedFunction.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserDefinedFunction.java index 346980c853e9..c55d61db15df 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUserDefinedFunction.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserDefinedFunction.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * The type Cosmos sync user defined function. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUserDefinedFunctionProperties.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserDefinedFunctionProperties.java similarity index 84% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUserDefinedFunctionProperties.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserDefinedFunctionProperties.java index d2b20d164721..9dacf38aaf6b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUserDefinedFunctionProperties.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserDefinedFunctionProperties.java @@ -1,10 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.ResourceResponse; -import com.azure.data.cosmos.internal.UserDefinedFunction; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.UserDefinedFunction; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.UserDefinedFunction; import java.util.List; import java.util.stream.Collectors; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUserDefinedFunctionResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserDefinedFunctionResponse.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUserDefinedFunctionResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserDefinedFunctionResponse.java index bb8009b4f3a6..e8d9b3c9709f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUserDefinedFunctionResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserDefinedFunctionResponse.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * The type Cosmos sync user defined function response. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUserProperties.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserProperties.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUserProperties.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserProperties.java index 84da36231a27..787c0d4306a7 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUserProperties.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserProperties.java @@ -1,11 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.ResourceResponse; -import com.azure.data.cosmos.internal.User; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.User; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.User; import java.util.List; import java.util.stream.Collectors; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUserResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserResponse.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUserResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserResponse.java index 741b75a99de0..d732eb0703ad 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosUserResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserResponse.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * The type Cosmos sync user response. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/DataType.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/DataType.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/DataType.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/DataType.java index 4ca998fd2779..6bc4f058c2b5 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/DataType.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/DataType.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.WordUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/DatabaseAccount.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/DatabaseAccount.java similarity index 85% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/DatabaseAccount.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/DatabaseAccount.java index 0924591140da..b89e135e32f8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/DatabaseAccount.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/DatabaseAccount.java @@ -1,11 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; - -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.ReplicationPolicy; -import com.azure.data.cosmos.internal.Utils; +package com.azure.cosmos; + +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.ReplicationPolicy; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.ReplicationPolicy; +import com.azure.cosmos.internal.Utils; import com.fasterxml.jackson.core.type.TypeReference; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -14,9 +17,9 @@ import java.util.HashMap; import java.util.Map; -import static com.azure.data.cosmos.BridgeInternal.populatePropertyBagJsonSerializable; -import static com.azure.data.cosmos.BridgeInternal.setProperty; -import static com.azure.data.cosmos.BridgeInternal.setResourceSelfLink; +import static com.azure.cosmos.BridgeInternal.populatePropertyBagJsonSerializable; +import static com.azure.cosmos.BridgeInternal.setProperty; +import static com.azure.cosmos.BridgeInternal.setResourceSelfLink; /** * Represents a database account in the Azure Cosmos DB database service. @@ -34,7 +37,7 @@ public class DatabaseAccount extends Resource { * Constructor. */ public DatabaseAccount() { - setResourceSelfLink(this, ""); + BridgeInternal.setResourceSelfLink(this, ""); } /** @@ -61,7 +64,7 @@ String getDatabasesLink() { * @param databasesLink the databases link. */ void setDatabasesLink(String databasesLink) { - setProperty(this, Constants.Properties.DATABASES_LINK, databasesLink); + BridgeInternal.setProperty(this, Constants.Properties.DATABASES_LINK, databasesLink); } /** @@ -79,7 +82,7 @@ String getMediaLink() { * @param medialink the media link. */ void setMediaLink(String medialink) { - setProperty(this, Constants.Properties.MEDIA_LINK, medialink); + BridgeInternal.setProperty(this, Constants.Properties.MEDIA_LINK, medialink); } /** @@ -97,7 +100,7 @@ String getAddressesLink() { * @param addresseslink the addresses link. */ void setAddressesLink(String addresseslink) { - setProperty(this, Constants.Properties.ADDRESS_LINK, addresseslink); + BridgeInternal.setProperty(this, Constants.Properties.ADDRESS_LINK, addresseslink); } /** @@ -226,7 +229,7 @@ public Iterable getWritableLocations() { * @param locations the list of writable locations. */ void setWritableLocations(Iterable locations) { - setProperty(this, Constants.Properties.WRITABLE_LOCATIONS, locations); + BridgeInternal.setProperty(this, Constants.Properties.WRITABLE_LOCATIONS, locations); } /** @@ -246,7 +249,7 @@ public Iterable getReadableLocations() { * @param locations the list of readable locations. */ void setReadableLocations(Iterable locations) { - setProperty(this, Constants.Properties.READABLE_LOCATIONS, locations); + BridgeInternal.setProperty(this, Constants.Properties.READABLE_LOCATIONS, locations); } public boolean getEnableMultipleWriteLocations() { @@ -254,13 +257,13 @@ public boolean getEnableMultipleWriteLocations() { } void setEnableMultipleWriteLocations(boolean value) { - setProperty(this, Constants.Properties.ENABLE_MULTIPLE_WRITE_LOCATIONS, value); + BridgeInternal.setProperty(this, Constants.Properties.ENABLE_MULTIPLE_WRITE_LOCATIONS, value); } void populatePropertyBag() { if (this.consistencyPolicy != null) { - populatePropertyBagJsonSerializable(this.consistencyPolicy); - setProperty(this, Constants.Properties.USER_CONSISTENCY_POLICY, this.consistencyPolicy); + BridgeInternal.populatePropertyBagJsonSerializable(this.consistencyPolicy); + BridgeInternal.setProperty(this, Constants.Properties.USER_CONSISTENCY_POLICY, this.consistencyPolicy); } } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/DatabaseAccountLocation.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/DatabaseAccountLocation.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/DatabaseAccountLocation.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/DatabaseAccountLocation.java index 64b13f8d6da6..6ef9a828781b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/DatabaseAccountLocation.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/DatabaseAccountLocation.java @@ -1,12 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.JsonSerializable; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.JsonSerializable; +import com.azure.cosmos.internal.Constants; -import static com.azure.data.cosmos.BridgeInternal.setProperty; +import static com.azure.cosmos.BridgeInternal.setProperty; /** * Represents the location of a database account in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ExcludedPath.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ExcludedPath.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ExcludedPath.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ExcludedPath.java index c81791593c31..02548bc4cbf4 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ExcludedPath.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ExcludedPath.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; /** * Represents an excluded path of the IndexingPolicy in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/FeedOptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/FeedOptions.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/FeedOptions.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/FeedOptions.java index b215a6722a10..58f926d2f447 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/FeedOptions.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/FeedOptions.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/FeedResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/FeedResponse.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/FeedResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/FeedResponse.java index dbab545b16ce..562077f1a137 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/FeedResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/FeedResponse.java @@ -1,12 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; - -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.QueryMetrics; -import com.azure.data.cosmos.internal.QueryMetricsConstants; +package com.azure.cosmos; + +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.QueryMetrics; +import com.azure.cosmos.internal.QueryMetricsConstants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.QueryMetrics; +import com.azure.cosmos.internal.QueryMetricsConstants; import org.apache.commons.lang3.StringUtils; import java.util.HashMap; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/FeedResponseDiagnostics.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/FeedResponseDiagnostics.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/FeedResponseDiagnostics.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/FeedResponseDiagnostics.java index 9de9ee470b33..71144380a4df 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/FeedResponseDiagnostics.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/FeedResponseDiagnostics.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.QueryMetrics; +import com.azure.cosmos.internal.QueryMetrics; +import com.azure.cosmos.internal.QueryMetrics; import org.apache.commons.lang3.StringUtils; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ForbiddenException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ForbiddenException.java similarity index 78% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ForbiddenException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ForbiddenException.java index 92e8afd72475..313a2a028a37 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ForbiddenException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ForbiddenException.java @@ -1,12 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; - -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; +package com.azure.cosmos; + +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; import java.net.URI; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/GoneException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/GoneException.java similarity index 83% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/GoneException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/GoneException.java index d89d585fd67b..31b485078d16 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/GoneException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/GoneException.java @@ -1,13 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; - -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; +package com.azure.cosmos; + +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; import java.net.URI; import java.util.HashMap; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/HashIndex.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/HashIndex.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/HashIndex.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/HashIndex.java index 754ba9b54b03..6974b3efc96a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/HashIndex.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/HashIndex.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; import org.apache.commons.lang3.StringUtils; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/IncludedPath.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/IncludedPath.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/IncludedPath.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/IncludedPath.java index f728a689f460..7733757b335f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/IncludedPath.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/IncludedPath.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/Index.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/Index.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/Index.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/Index.java index e91d478c3c76..9523f9856ff0 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/Index.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/Index.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; import org.apache.commons.lang3.StringUtils; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/IndexKind.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/IndexKind.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/IndexKind.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/IndexKind.java index b26a68139eb6..3160cd4c6f83 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/IndexKind.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/IndexKind.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import org.apache.commons.text.WordUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/IndexingDirective.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/IndexingDirective.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/IndexingDirective.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/IndexingDirective.java index 43d123d8f3aa..968643d0a6e2 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/IndexingDirective.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/IndexingDirective.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import org.apache.commons.text.WordUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/IndexingMode.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/IndexingMode.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/IndexingMode.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/IndexingMode.java index 304182006ef2..79bd9d68cef6 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/IndexingMode.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/IndexingMode.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import org.apache.commons.text.WordUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/IndexingPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/IndexingPolicy.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/IndexingPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/IndexingPolicy.java index fd3cdfcd823e..3a0e5cae4247 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/IndexingPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/IndexingPolicy.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; import com.fasterxml.jackson.databind.node.ArrayNode; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/InternalServerErrorException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/InternalServerErrorException.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/InternalServerErrorException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/InternalServerErrorException.java index 17310a6bffae..a8aeaa63defd 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/InternalServerErrorException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/InternalServerErrorException.java @@ -1,12 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; import java.net.URI; import java.net.URL; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/InvalidPartitionException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/InvalidPartitionException.java similarity index 78% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/InvalidPartitionException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/InvalidPartitionException.java index eab7fb4821c4..da6329d6929f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/InvalidPartitionException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/InvalidPartitionException.java @@ -1,12 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.directconnectivity.WFConstants; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.directconnectivity.WFConstants; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.directconnectivity.WFConstants; +import com.azure.cosmos.internal.http.HttpHeaders; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/JsonSerializable.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/JsonSerializable.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/JsonSerializable.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/JsonSerializable.java index a70ec3c7e896..48c0bb6dd4c3 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/JsonSerializable.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/JsonSerializable.java @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.Utils; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/LockedException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/LockedException.java similarity index 79% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/LockedException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/LockedException.java index 24ec945d46f0..f8607bd4b908 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/LockedException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/LockedException.java @@ -1,11 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; import java.util.Map; @@ -52,4 +56,4 @@ public LockedException(String message, HttpHeaders headers, String requestUriStr HttpConstants.StatusCodes.LOCKED, requestUriString); } -} \ No newline at end of file +} diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/MethodNotAllowedException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/MethodNotAllowedException.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/MethodNotAllowedException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/MethodNotAllowedException.java index 0411bd60a4d5..2f6a73fd6419 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/MethodNotAllowedException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/MethodNotAllowedException.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; import java.net.URI; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/NotFoundException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/NotFoundException.java similarity index 83% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/NotFoundException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/NotFoundException.java index fe2188e5bfae..5c9f8780a1da 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/NotFoundException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/NotFoundException.java @@ -1,11 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; import java.net.URI; import java.util.Map; @@ -64,4 +68,4 @@ public NotFoundException(String message, HttpHeaders headers, URI requestUri) { HttpConstants.StatusCodes.NOTFOUND, requestUri); } -} \ No newline at end of file +} diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionIsMigratingException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionIsMigratingException.java similarity index 78% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionIsMigratingException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionIsMigratingException.java index ff87c738c2b6..609da74e102d 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionIsMigratingException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionIsMigratingException.java @@ -1,12 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.directconnectivity.WFConstants; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.directconnectivity.WFConstants; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.directconnectivity.WFConstants; +import com.azure.cosmos.internal.http.HttpHeaders; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKey.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKey.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKey.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKey.java index 18e66f7565b8..f61d953502d8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKey.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKey.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Utils; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; /** * Represents a partition key value in the Azure Cosmos DB database service. A diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKeyDefinition.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKeyDefinition.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKeyDefinition.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKeyDefinition.java index 95d18c5a6c4b..faf18f4f79d6 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKeyDefinition.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKeyDefinition.java @@ -1,11 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; - -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternal; +package com.azure.cosmos; + +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKeyDefinitionVersion.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKeyDefinitionVersion.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKeyDefinitionVersion.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKeyDefinitionVersion.java index ab3cdce8bc65..c0d4b72b9f35 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKeyDefinitionVersion.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKeyDefinitionVersion.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * Partitioning version. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKeyRangeGoneException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKeyRangeGoneException.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKeyRangeGoneException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKeyRangeGoneException.java index b4cdb661a272..2ddb0ccc9cb5 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKeyRangeGoneException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKeyRangeGoneException.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.directconnectivity.WFConstants; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.directconnectivity.WFConstants; +import com.azure.cosmos.internal.http.HttpHeaders; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKeyRangeIsSplittingException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKeyRangeIsSplittingException.java similarity index 79% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKeyRangeIsSplittingException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKeyRangeIsSplittingException.java index 8de6782bbd5a..e553231021a8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKeyRangeIsSplittingException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKeyRangeIsSplittingException.java @@ -1,12 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.directconnectivity.WFConstants; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.directconnectivity.WFConstants; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.directconnectivity.WFConstants; +import com.azure.cosmos.internal.http.HttpHeaders; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKind.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKind.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKind.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKind.java index d87132605f15..a89b04c9ae24 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PartitionKind.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PartitionKind.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import org.apache.commons.text.WordUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PermissionMode.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PermissionMode.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PermissionMode.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PermissionMode.java index bdd4515b5227..4c1ac118d2c0 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PermissionMode.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PermissionMode.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import org.apache.commons.text.WordUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PreconditionFailedException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PreconditionFailedException.java similarity index 81% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PreconditionFailedException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PreconditionFailedException.java index 7109ac4c0943..d398832353f4 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/PreconditionFailedException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/PreconditionFailedException.java @@ -1,11 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; import java.util.Map; @@ -53,4 +57,4 @@ public PreconditionFailedException(String message, HttpHeaders headers, String r HttpConstants.StatusCodes.PRECONDITION_FAILED, requestUriString); } -} \ No newline at end of file +} diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RangeIndex.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RangeIndex.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RangeIndex.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RangeIndex.java index 43172cbb91f5..4282a570aad4 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RangeIndex.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RangeIndex.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; import org.apache.commons.lang3.StringUtils; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RequestEntityTooLargeException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RequestEntityTooLargeException.java similarity index 81% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RequestEntityTooLargeException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RequestEntityTooLargeException.java index 7f40534e11e7..98435bff95d5 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RequestEntityTooLargeException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RequestEntityTooLargeException.java @@ -1,11 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; import java.util.Map; @@ -52,4 +56,4 @@ public RequestEntityTooLargeException(String message, HttpHeaders headers, Strin HttpConstants.StatusCodes.REQUEST_ENTITY_TOO_LARGE, requestUriString); } -} \ No newline at end of file +} diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RequestRateTooLargeException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RequestRateTooLargeException.java similarity index 82% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RequestRateTooLargeException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RequestRateTooLargeException.java index 0a798d5a3e54..703c6d645630 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RequestRateTooLargeException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RequestRateTooLargeException.java @@ -1,12 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; - -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; +package com.azure.cosmos; + +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; import java.net.URI; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RequestTimeoutException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RequestTimeoutException.java similarity index 81% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RequestTimeoutException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RequestTimeoutException.java index b03081c35213..53f0e8f59212 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RequestTimeoutException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RequestTimeoutException.java @@ -1,13 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; import java.net.URI; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/Resource.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/Resource.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/Resource.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/Resource.java index 7b2631b6e845..4e4dd44c5d4b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/Resource.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/Resource.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RetryOptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RetryOptions.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RetryOptions.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RetryOptions.java index 240a69139e31..ea7792d08338 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RetryOptions.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RetryOptions.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * Encapsulates retry options in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RetryWithException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RetryWithException.java similarity index 82% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RetryWithException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RetryWithException.java index 3c3e662a8e02..02b1bfb0b59b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/RetryWithException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/RetryWithException.java @@ -1,11 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; - -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; +package com.azure.cosmos; + +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; import java.net.URI; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SerializationFormattingPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SerializationFormattingPolicy.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SerializationFormattingPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SerializationFormattingPolicy.java index 224e22b7f10c..cda261d5929f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SerializationFormattingPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SerializationFormattingPolicy.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * The formatting policy associated with JSON serialization in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ServiceUnavailableException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ServiceUnavailableException.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ServiceUnavailableException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ServiceUnavailableException.java index ccc455370ccb..6a74a2f6ba59 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ServiceUnavailableException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ServiceUnavailableException.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; import java.net.URI; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SpatialIndex.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SpatialIndex.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SpatialIndex.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SpatialIndex.java index 9d1e15d10a75..5e80f3894902 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SpatialIndex.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SpatialIndex.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; import org.apache.commons.lang3.StringUtils; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SpatialSpec.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SpatialSpec.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SpatialSpec.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SpatialSpec.java index ad6dc9d45df6..640348d3a5dd 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SpatialSpec.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SpatialSpec.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; import java.util.ArrayList; import java.util.Collection; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SpatialType.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SpatialType.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SpatialType.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SpatialType.java index 999c33552fd5..3e355d0b7cba 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SpatialType.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SpatialType.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.WordUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SqlParameter.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SqlParameter.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SqlParameter.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SqlParameter.java index ad1175de826c..014dd2cd5ed8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SqlParameter.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SqlParameter.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; /** * Represents a SQL parameter in the SqlQuerySpec used for queries in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SqlParameterList.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SqlParameterList.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SqlParameterList.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SqlParameterList.java index a56335b82393..5d45b50b7406 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SqlParameterList.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SqlParameterList.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import java.util.ArrayList; import java.util.Arrays; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SqlQuerySpec.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SqlQuerySpec.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SqlQuerySpec.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SqlQuerySpec.java index 5665bac34dfe..55d62d52353e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/SqlQuerySpec.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/SqlQuerySpec.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import java.util.ArrayList; import java.util.Collection; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/TokenResolver.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/TokenResolver.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/TokenResolver.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/TokenResolver.java index 3290e5e72344..6e3ea9daa467 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/TokenResolver.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/TokenResolver.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/TriggerOperation.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/TriggerOperation.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/TriggerOperation.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/TriggerOperation.java index f075bda6f43c..4ab7b566df38 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/TriggerOperation.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/TriggerOperation.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import org.apache.commons.text.WordUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/TriggerType.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/TriggerType.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/TriggerType.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/TriggerType.java index 0b36cb86c364..03e88b82b194 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/TriggerType.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/TriggerType.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import org.apache.commons.text.WordUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/UnauthorizedException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/UnauthorizedException.java similarity index 78% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/UnauthorizedException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/UnauthorizedException.java index 2ff6f50ef2c8..e5f5916be810 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/UnauthorizedException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/UnauthorizedException.java @@ -1,12 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; - -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; +package com.azure.cosmos; + +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.http.HttpHeaders; import java.net.URI; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/UniqueKey.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/UniqueKey.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/UniqueKey.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/UniqueKey.java index 52719c20af4b..4bafaa839090 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/UniqueKey.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/UniqueKey.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; import java.util.ArrayList; import java.util.Collection; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/UniqueKeyPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/UniqueKeyPolicy.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/UniqueKeyPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/UniqueKeyPolicy.java index 7d595a1cd59f..894f891b801b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/UniqueKeyPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/UniqueKeyPolicy.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Constants; import java.util.ArrayList; import java.util.Collection; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/AsyncDocumentClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/AsyncDocumentClient.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/AsyncDocumentClient.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/AsyncDocumentClient.java index 3267758bffca..c58ac77aac4a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/AsyncDocumentClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/AsyncDocumentClient.java @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - -import com.azure.data.cosmos.ChangeFeedOptions; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosKeyCredential; -import com.azure.data.cosmos.DatabaseAccount; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.SqlQuerySpec; -import com.azure.data.cosmos.TokenResolver; +package com.azure.cosmos.internal; + +import com.azure.cosmos.ChangeFeedOptions; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosKeyCredential; +import com.azure.cosmos.DatabaseAccount; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.TokenResolver; import org.apache.commons.lang3.StringUtils; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/AuthorizationTokenProvider.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/AuthorizationTokenProvider.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/AuthorizationTokenProvider.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/AuthorizationTokenProvider.java index 0f09da129559..6abf61d04bf6 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/AuthorizationTokenProvider.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/AuthorizationTokenProvider.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/AuthorizationTokenType.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/AuthorizationTokenType.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/AuthorizationTokenType.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/AuthorizationTokenType.java index ea4b2a16f69a..1cf57ebb8a47 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/AuthorizationTokenType.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/AuthorizationTokenType.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; public enum AuthorizationTokenType { Invalid, diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/BackoffRetryUtility.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/BackoffRetryUtility.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/BackoffRetryUtility.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/BackoffRetryUtility.java index c4296b8dc905..b093fa859e94 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/BackoffRetryUtility.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/BackoffRetryUtility.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/BaseAuthorizationTokenProvider.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/BaseAuthorizationTokenProvider.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/BaseAuthorizationTokenProvider.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/BaseAuthorizationTokenProvider.java index 484306fc2b61..2ea8b0f3acfe 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/BaseAuthorizationTokenProvider.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/BaseAuthorizationTokenProvider.java @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.CosmosKeyCredential; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.CosmosKeyCredential; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; import org.apache.commons.lang3.StringUtils; import javax.crypto.Mac; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/BaseDatabaseAccountConfigurationProvider.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/BaseDatabaseAccountConfigurationProvider.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/BaseDatabaseAccountConfigurationProvider.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/BaseDatabaseAccountConfigurationProvider.java index b62e9f6b6242..814fc5f22fe9 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/BaseDatabaseAccountConfigurationProvider.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/BaseDatabaseAccountConfigurationProvider.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.DatabaseAccount; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.DatabaseAccount; /** * Used internally to provides functionality to work with database account configuration in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Bytes.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Bytes.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Bytes.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Bytes.java index ca195cf0a617..9e93d1a0389f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Bytes.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Bytes.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; public class Bytes { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ChangeFeedQueryImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ChangeFeedQueryImpl.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ChangeFeedQueryImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ChangeFeedQueryImpl.java index b4a5dc38405d..52d74f49cdca 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ChangeFeedQueryImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ChangeFeedQueryImpl.java @@ -1,14 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ChangeFeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.query.Paginator; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternal; -import com.azure.data.cosmos.internal.routing.PartitionKeyRangeIdentity; +package com.azure.cosmos.internal; + +import com.azure.cosmos.internal.query.Paginator; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ChangeFeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.query.Paginator; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; import reactor.core.publisher.Flux; import java.util.HashMap; @@ -16,7 +19,7 @@ import java.util.function.BiFunction; import java.util.function.Function; -import static com.azure.data.cosmos.CommonsBridgeInternal.partitionKeyRangeIdInternal; +import static com.azure.cosmos.CommonsBridgeInternal.partitionKeyRangeIdInternal; class ChangeFeedQueryImpl { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ClearingSessionContainerClientRetryPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ClearingSessionContainerClientRetryPolicy.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ClearingSessionContainerClientRetryPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ClearingSessionContainerClientRetryPolicy.java index ff8248c714ba..3041aacd7dda 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ClearingSessionContainerClientRetryPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ClearingSessionContainerClientRetryPolicy.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosClientException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ClientRetryPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ClientRetryPolicy.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ClientRetryPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ClientRetryPolicy.java index d79376481df4..545bfae20d1f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ClientRetryPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ClientRetryPolicy.java @@ -1,12 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.CosmosResponseDiagnostics; -import com.azure.data.cosmos.RetryOptions; -import com.azure.data.cosmos.internal.directconnectivity.WebExceptionUtility; +package com.azure.cosmos.internal; + +import com.azure.cosmos.internal.directconnectivity.WebExceptionUtility; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosResponseDiagnostics; +import com.azure.cosmos.RetryOptions; +import com.azure.cosmos.internal.directconnectivity.WebExceptionUtility; import org.apache.commons.collections4.list.UnmodifiableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Configs.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Configs.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Configs.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Configs.java index a78db3824f1e..8ce481e0c439 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Configs.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Configs.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.directconnectivity.Protocol; +import com.azure.cosmos.internal.directconnectivity.Protocol; +import com.azure.cosmos.internal.directconnectivity.Protocol; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.SslProvider; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Conflict.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Conflict.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Conflict.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Conflict.java index 7cdd77b13ffc..20191e361c4a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Conflict.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Conflict.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.Resource; +import com.azure.cosmos.Resource; import java.lang.reflect.InvocationTargetException; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Constants.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Constants.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Constants.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Constants.java index d4a4ece86fd3..5bd9226b9366 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Constants.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Constants.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; /** * Used internally. Constants in the Azure Cosmos DB database service Java SDK. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ContentSerializationFormat.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ContentSerializationFormat.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ContentSerializationFormat.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ContentSerializationFormat.java index 164f6a7e6911..ea3ee98aadae 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ContentSerializationFormat.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ContentSerializationFormat.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; public enum ContentSerializationFormat { /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Database.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Database.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Database.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Database.java index 77b520eff5e6..c4654750a632 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Database.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Database.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.Resource; +import com.azure.cosmos.Resource; import org.apache.commons.lang3.StringUtils; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/DatabaseAccountConfigurationProvider.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/DatabaseAccountConfigurationProvider.java similarity index 82% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/DatabaseAccountConfigurationProvider.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/DatabaseAccountConfigurationProvider.java index 48591d76229a..e62bf63c88a4 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/DatabaseAccountConfigurationProvider.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/DatabaseAccountConfigurationProvider.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.ConsistencyLevel; +import com.azure.cosmos.ConsistencyLevel; /** * Defines an interface to work with database account configuration in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/DatabaseAccountManagerInternal.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/DatabaseAccountManagerInternal.java similarity index 84% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/DatabaseAccountManagerInternal.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/DatabaseAccountManagerInternal.java index 4a6f6ebcf2a3..36314feaabef 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/DatabaseAccountManagerInternal.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/DatabaseAccountManagerInternal.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.DatabaseAccount; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.DatabaseAccount; import reactor.core.publisher.Flux; import java.net.URI; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/DatabaseForTest.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/DatabaseForTest.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/DatabaseForTest.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/DatabaseForTest.java index 72f0cd23eaf8..fffb2e7005e1 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/DatabaseForTest.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/DatabaseForTest.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.SqlParameter; -import com.azure.data.cosmos.SqlParameterList; -import com.azure.data.cosmos.SqlQuerySpec; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.SqlParameter; +import com.azure.cosmos.SqlParameterList; +import com.azure.cosmos.SqlQuerySpec; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Document.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Document.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Document.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Document.java index 7cdd45e32493..5f1802ebc61c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Document.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Document.java @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.Resource; +import com.azure.cosmos.Resource; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; -import static com.azure.data.cosmos.BridgeInternal.remove; -import static com.azure.data.cosmos.BridgeInternal.setProperty; -import static com.azure.data.cosmos.BridgeInternal.setMapper; +import static com.azure.cosmos.BridgeInternal.remove; +import static com.azure.cosmos.BridgeInternal.setProperty; +import static com.azure.cosmos.BridgeInternal.setMapper; /** * Represents a document in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/DocumentCollection.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/DocumentCollection.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/DocumentCollection.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/DocumentCollection.java index e099925f555a..5e4de48eaeee 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/DocumentCollection.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/DocumentCollection.java @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.ConflictResolutionPolicy; -import com.azure.data.cosmos.IndexingPolicy; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.UniqueKeyPolicy; +import com.azure.cosmos.ConflictResolutionPolicy; +import com.azure.cosmos.IndexingPolicy; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.Resource; +import com.azure.cosmos.UniqueKeyPolicy; import org.apache.commons.lang3.StringUtils; -import static com.azure.data.cosmos.BridgeInternal.populatePropertyBagJsonSerializable; -import static com.azure.data.cosmos.BridgeInternal.setProperty; -import static com.azure.data.cosmos.BridgeInternal.remove; +import static com.azure.cosmos.BridgeInternal.populatePropertyBagJsonSerializable; +import static com.azure.cosmos.BridgeInternal.setProperty; +import static com.azure.cosmos.BridgeInternal.remove; /** * Represents a document collection in the Azure Cosmos DB database service. A collection is a named logical container diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/DocumentServiceRequestContext.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/DocumentServiceRequestContext.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/DocumentServiceRequestContext.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/DocumentServiceRequestContext.java index 66f0744ac510..9bcf49ed01f8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/DocumentServiceRequestContext.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/DocumentServiceRequestContext.java @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosResponseDiagnostics; -import com.azure.data.cosmos.internal.directconnectivity.StoreResponse; -import com.azure.data.cosmos.internal.directconnectivity.StoreResult; -import com.azure.data.cosmos.internal.directconnectivity.TimeoutHelper; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.directconnectivity.StoreResponse; +import com.azure.cosmos.internal.directconnectivity.StoreResult; +import com.azure.cosmos.internal.directconnectivity.TimeoutHelper; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosResponseDiagnostics; import java.net.URL; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/EnumerationDirection.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/EnumerationDirection.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/EnumerationDirection.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/EnumerationDirection.java index d459960db5de..2a0bb61c369c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/EnumerationDirection.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/EnumerationDirection.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; public enum EnumerationDirection { /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Exceptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Exceptions.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Exceptions.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Exceptions.java index f72f0cc183a0..d5fe70ffb012 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Exceptions.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Exceptions.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosClientException; /** * While this class is public, but it is not part of our published public APIs. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/FanoutOperationState.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/FanoutOperationState.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/FanoutOperationState.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/FanoutOperationState.java index 73abde2ebcd6..c4bfa9943d78 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/FanoutOperationState.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/FanoutOperationState.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; public enum FanoutOperationState { /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/GlobalEndpointManager.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/GlobalEndpointManager.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/GlobalEndpointManager.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/GlobalEndpointManager.java index 04d2e41bc5bf..5ee071a04398 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/GlobalEndpointManager.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/GlobalEndpointManager.java @@ -1,13 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.DatabaseAccount; -import com.azure.data.cosmos.internal.routing.LocationCache; -import com.azure.data.cosmos.internal.routing.LocationHelper; +package com.azure.cosmos.internal; + +import com.azure.cosmos.internal.routing.LocationCache; +import com.azure.cosmos.internal.routing.LocationHelper; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.DatabaseAccount; +import com.azure.cosmos.internal.routing.LocationCache; +import com.azure.cosmos.internal.routing.LocationHelper; import org.apache.commons.collections4.list.UnmodifiableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/HttpConstants.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/HttpConstants.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/HttpConstants.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/HttpConstants.java index 4f926800cbd5..2d23d579fc7e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/HttpConstants.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/HttpConstants.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; /** * Used internally. HTTP constants in the Azure Cosmos DB database service Java diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/IAuthorizationTokenProvider.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/IAuthorizationTokenProvider.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/IAuthorizationTokenProvider.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/IAuthorizationTokenProvider.java index a3ce6cce3f2a..6b699a196161 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/IAuthorizationTokenProvider.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/IAuthorizationTokenProvider.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ICollectionRoutingMapCache.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ICollectionRoutingMapCache.java similarity index 84% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ICollectionRoutingMapCache.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ICollectionRoutingMapCache.java index ce1bf103cf2d..04cf646cf8de 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ICollectionRoutingMapCache.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ICollectionRoutingMapCache.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.routing.CollectionRoutingMap; +import com.azure.cosmos.internal.routing.CollectionRoutingMap; +import com.azure.cosmos.internal.routing.CollectionRoutingMap; import reactor.core.publisher.Mono; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/IDocumentClientRetryPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/IDocumentClientRetryPolicy.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/IDocumentClientRetryPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/IDocumentClientRetryPolicy.java index 2fa708ebb3c2..4aba59791e62 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/IDocumentClientRetryPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/IDocumentClientRetryPolicy.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/IRetryPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/IRetryPolicy.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/IRetryPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/IRetryPolicy.java index b200cca819dc..8cbd6ca021f4 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/IRetryPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/IRetryPolicy.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/IRetryPolicyFactory.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/IRetryPolicyFactory.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/IRetryPolicyFactory.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/IRetryPolicyFactory.java index 31c4179eea6b..1f6835a2c501 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/IRetryPolicyFactory.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/IRetryPolicyFactory.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; /** * While this class is public, but it is not part of our published public APIs. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/IRoutingMapProvider.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/IRoutingMapProvider.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/IRoutingMapProvider.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/IRoutingMapProvider.java index 8d9c5236d25c..058ec4ab0e80 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/IRoutingMapProvider.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/IRoutingMapProvider.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.routing.Range; +import com.azure.cosmos.internal.routing.Range; +import com.azure.cosmos.internal.routing.Range; import reactor.core.publisher.Mono; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ISessionContainer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ISessionContainer.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ISessionContainer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ISessionContainer.java index 2916f8b37e73..c11e3d3525b1 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ISessionContainer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ISessionContainer.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.ISessionToken; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.ISessionToken; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ISessionToken.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ISessionToken.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ISessionToken.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ISessionToken.java index 3dcf85f78e35..da6b58c84ebc 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ISessionToken.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ISessionToken.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosClientException; /** * Models session token. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Integers.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Integers.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Integers.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Integers.java index 585416fccb7b..0edb1ee5a126 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Integers.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Integers.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; public class Integers { public static int tryParse(String value, int defaultValue) { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/InternalConstants.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/InternalConstants.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/InternalConstants.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/InternalConstants.java index af10bfe4994f..db23e90973aa 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/InternalConstants.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/InternalConstants.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; class InternalConstants { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/InvalidPartitionExceptionRetryPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/InvalidPartitionExceptionRetryPolicy.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/InvalidPartitionExceptionRetryPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/InvalidPartitionExceptionRetryPolicy.java index 9e00b8cf049b..b4a33244c461 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/InvalidPartitionExceptionRetryPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/InvalidPartitionExceptionRetryPolicy.java @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.internal.caches.RxCollectionCache; +import com.azure.cosmos.internal.caches.RxCollectionCache; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.internal.caches.RxCollectionCache; import reactor.core.publisher.Mono; import java.time.Duration; @@ -31,7 +32,7 @@ public InvalidPartitionExceptionRetryPolicy(RxCollectionCache collectionCache, this.nextPolicy = nextPolicy; // TODO the resource address should be inferred from exception - this.collectionLink = com.azure.data.cosmos.internal.Utils.getCollectionName(resourceFullName); + this.collectionLink = Utils.getCollectionName(resourceFullName); this.feedOptions = feedOptions; } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/JavaStreamUtils.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/JavaStreamUtils.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/JavaStreamUtils.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/JavaStreamUtils.java index 7f0d1d77d7fb..dc08f8fcfbc2 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/JavaStreamUtils.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/JavaStreamUtils.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import java.util.Arrays; import java.util.Collection; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/LifeCycleUtils.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/LifeCycleUtils.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/LifeCycleUtils.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/LifeCycleUtils.java index a73782140e35..539267709da9 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/LifeCycleUtils.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/LifeCycleUtils.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Lists.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Lists.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Lists.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Lists.java index 4f193c4d52a8..ca342f08369b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Lists.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Lists.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Longs.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Longs.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Longs.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Longs.java index e19991826fed..a3ca9c086e30 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Longs.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Longs.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; public class Longs { public static long tryParse(String value, long defaultValue) { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/MigrateCollectionDirective.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/MigrateCollectionDirective.java similarity index 85% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/MigrateCollectionDirective.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/MigrateCollectionDirective.java index 75f68b78707f..19203fd50545 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/MigrateCollectionDirective.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/MigrateCollectionDirective.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; public enum MigrateCollectionDirective { /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/MutableVolatile.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/MutableVolatile.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/MutableVolatile.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/MutableVolatile.java index d176b6a16908..9c0f9ea9c6e9 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/MutableVolatile.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/MutableVolatile.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; public class MutableVolatile { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ObservableHelper.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ObservableHelper.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ObservableHelper.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ObservableHelper.java index 0e9d735e4f96..171820c9eda3 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ObservableHelper.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ObservableHelper.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Offer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Offer.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Offer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Offer.java index 03243a64974d..2aacee7bfac4 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Offer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Offer.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.Resource; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.Resource; import com.fasterxml.jackson.databind.node.ObjectNode; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/OperationType.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/OperationType.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/OperationType.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/OperationType.java index 5b87499b9bda..4a087e442978 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/OperationType.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/OperationType.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; /** * Operation types in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PartitionKeyMismatchRetryPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PartitionKeyMismatchRetryPolicy.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PartitionKeyMismatchRetryPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PartitionKeyMismatchRetryPolicy.java index 53f7f70a195d..0b26c6244e6c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PartitionKeyMismatchRetryPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PartitionKeyMismatchRetryPolicy.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.caches.RxClientCollectionCache; +import com.azure.cosmos.internal.caches.RxClientCollectionCache; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.caches.RxClientCollectionCache; import reactor.core.publisher.Mono; import java.time.Duration; @@ -40,7 +41,7 @@ public PartitionKeyMismatchRetryPolicy( this.nextRetryPolicy = nextRetryPolicy; // TODO: this should be retrievable from document client exception. - collectionLink = com.azure.data.cosmos.internal.Utils.getCollectionName(resourceFullName); + collectionLink = Utils.getCollectionName(resourceFullName); this.options = options; } @@ -78,7 +79,7 @@ public Mono shouldRetry(Exception exception) { /* (non-Javadoc) - * @see com.azure.data.cosmos.internal.internal.query.IDocumentClientRetryPolicy#onBeforeSendRequest(RxDocumentServiceRequest) + * @see com.azure.cosmos.internal.internal.query.IDocumentClientRetryPolicy#onBeforeSendRequest(RxDocumentServiceRequest) */ @Override public void onBeforeSendRequest(RxDocumentServiceRequest request) { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PartitionKeyRange.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PartitionKeyRange.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PartitionKeyRange.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PartitionKeyRange.java index 0b5f77629e95..c273181dcd76 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PartitionKeyRange.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PartitionKeyRange.java @@ -1,11 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.routing.Range; +import com.azure.cosmos.internal.routing.Range; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.routing.Range; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PartitionKeyRangeGoneRetryPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PartitionKeyRangeGoneRetryPolicy.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PartitionKeyRangeGoneRetryPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PartitionKeyRangeGoneRetryPolicy.java index a2ced808b2ef..3726de103578 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PartitionKeyRangeGoneRetryPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PartitionKeyRangeGoneRetryPolicy.java @@ -1,12 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.internal.caches.IPartitionKeyRangeCache; -import com.azure.data.cosmos.internal.caches.RxCollectionCache; -import com.azure.data.cosmos.internal.routing.CollectionRoutingMap; +package com.azure.cosmos.internal; + +import com.azure.cosmos.internal.caches.IPartitionKeyRangeCache; +import com.azure.cosmos.internal.caches.RxCollectionCache; +import com.azure.cosmos.internal.routing.CollectionRoutingMap; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.internal.caches.IPartitionKeyRangeCache; +import com.azure.cosmos.internal.caches.RxCollectionCache; +import com.azure.cosmos.internal.routing.CollectionRoutingMap; import reactor.core.publisher.Mono; import java.time.Duration; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PathInfo.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PathInfo.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PathInfo.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PathInfo.java index bccbf8ba9354..424ae62d78c0 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PathInfo.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PathInfo.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; /** * Represents a resource path's information in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PathParser.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PathParser.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PathParser.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PathParser.java index 3796ebd662b5..e5729e629d85 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PathParser.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PathParser.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import java.util.ArrayList; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Paths.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Paths.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Paths.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Paths.java index f50a48087303..ab9b79807d0c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Paths.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Paths.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; /** * Used internally. Contains string constants to work with the paths in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PathsHelper.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PathsHelper.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PathsHelper.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PathsHelper.java index 40e4c63a4361..a1806c509090 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/PathsHelper.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/PathsHelper.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BadRequestException; -import com.azure.data.cosmos.Resource; +import com.azure.cosmos.BadRequestException; +import com.azure.cosmos.Resource; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.text.StringEscapeUtils; @@ -22,9 +22,9 @@ public class PathsHelper { public static String generatePath(ResourceType resourceType, RxDocumentServiceRequest request, boolean isFeed) { if (request.getIsNameBased()) { - return PathsHelper.generatePathForNameBased(resourceType, request.getResourceAddress(), isFeed); + return generatePathForNameBased(resourceType, request.getResourceAddress(), isFeed); } else { - return PathsHelper.generatePath(resourceType, request.getResourceId(), isFeed); + return generatePath(resourceType, request.getResourceId(), isFeed); } } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Permission.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Permission.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Permission.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Permission.java index e6955665f839..dbed72e67032 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Permission.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Permission.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.PermissionMode; -import com.azure.data.cosmos.Resource; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PermissionMode; +import com.azure.cosmos.Resource; import com.fasterxml.jackson.databind.node.ArrayNode; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Quadruple.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Quadruple.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Quadruple.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Quadruple.java index 07f8f66a8d13..30f1576789e6 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Quadruple.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Quadruple.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; /** * Represents class with four different generic objects. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/QueryCompatibilityMode.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/QueryCompatibilityMode.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/QueryCompatibilityMode.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/QueryCompatibilityMode.java index 0ef0346870cb..0436e1b77175 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/QueryCompatibilityMode.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/QueryCompatibilityMode.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; /** * A client query compatibility mode when making query request in the Azure Cosmos DB database service. Can be used diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/QueryMetrics.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/QueryMetrics.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/QueryMetrics.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/QueryMetrics.java index b44b1d65045a..b5eb7ba1c6eb 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/QueryMetrics.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/QueryMetrics.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.query.metrics.ClientSideMetrics; -import com.azure.data.cosmos.internal.query.metrics.FetchExecutionRange; -import com.azure.data.cosmos.internal.query.metrics.QueryMetricsTextWriter; -import com.azure.data.cosmos.internal.query.metrics.SchedulingTimeSpan; +import com.azure.cosmos.internal.query.metrics.ClientSideMetrics; +import com.azure.cosmos.internal.query.metrics.FetchExecutionRange; +import com.azure.cosmos.internal.query.metrics.QueryMetricsTextWriter; +import com.azure.cosmos.internal.query.metrics.SchedulingTimeSpan; import org.apache.commons.lang3.tuple.ImmutablePair; import java.time.Duration; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/QueryMetricsConstants.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/QueryMetricsConstants.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/QueryMetricsConstants.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/QueryMetricsConstants.java index a7fe5402833d..11c17f6e862f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/QueryMetricsConstants.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/QueryMetricsConstants.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; public final class QueryMetricsConstants { // QueryMetrics diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/QueryMetricsUtils.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/QueryMetricsUtils.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/QueryMetricsUtils.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/QueryMetricsUtils.java index f12eb5f30745..83b5a2994ba6 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/QueryMetricsUtils.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/QueryMetricsUtils.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/QueryPreparationTimes.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/QueryPreparationTimes.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/QueryPreparationTimes.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/QueryPreparationTimes.java index f97df97714bd..ad0e6ee811e9 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/QueryPreparationTimes.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/QueryPreparationTimes.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import java.time.Duration; import java.util.Collection; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RMResources.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RMResources.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RMResources.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RMResources.java index 1b37f9ef73c0..f265e4bb6048 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RMResources.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RMResources.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; public class RMResources { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ReadFeedKeyType.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ReadFeedKeyType.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ReadFeedKeyType.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ReadFeedKeyType.java index d156072e9b79..f645c827b30a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ReadFeedKeyType.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ReadFeedKeyType.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; /** * Type of Start and End key for ReadFeedKey diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RemoteStorageType.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RemoteStorageType.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RemoteStorageType.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RemoteStorageType.java index 109269c95d51..c5177c48f724 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RemoteStorageType.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RemoteStorageType.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; public enum RemoteStorageType { /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RenameCollectionAwareClientRetryPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RenameCollectionAwareClientRetryPolicy.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RenameCollectionAwareClientRetryPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RenameCollectionAwareClientRetryPolicy.java index 437ab00aac5f..0d70da597db9 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RenameCollectionAwareClientRetryPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RenameCollectionAwareClientRetryPolicy.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.caches.RxClientCollectionCache; +import com.azure.cosmos.internal.caches.RxClientCollectionCache; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.caches.RxClientCollectionCache; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ReplicatedResourceClientUtils.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ReplicatedResourceClientUtils.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ReplicatedResourceClientUtils.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ReplicatedResourceClientUtils.java index 4d1a27ff2b3f..b6cecceccb7e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ReplicatedResourceClientUtils.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ReplicatedResourceClientUtils.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; /** * While this class is public, but it is not part of our published public APIs. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ReplicationPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ReplicationPolicy.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ReplicationPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ReplicationPolicy.java index 6458dbaf7512..d4f710c0cfb1 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ReplicationPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ReplicationPolicy.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.JsonSerializable; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.JsonSerializable; /** * Encapsulates the replication policy in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RequestChargeTracker.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RequestChargeTracker.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RequestChargeTracker.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RequestChargeTracker.java index 71755e7860f8..4cee2dcac66e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RequestChargeTracker.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RequestChargeTracker.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import java.util.concurrent.atomic.AtomicLong; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RequestOptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RequestOptions.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RequestOptions.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RequestOptions.java index 709908dc2621..fd1dc84b8964 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RequestOptions.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RequestOptions.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.AccessCondition; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.IndexingDirective; -import com.azure.data.cosmos.PartitionKey; +import com.azure.cosmos.AccessCondition; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.IndexingDirective; +import com.azure.cosmos.PartitionKey; import java.util.HashMap; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResetSessionTokenRetryPolicyFactory.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResetSessionTokenRetryPolicyFactory.java similarity index 84% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResetSessionTokenRetryPolicyFactory.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResetSessionTokenRetryPolicyFactory.java index e166193bedcd..ab5d1bbc5c6e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResetSessionTokenRetryPolicyFactory.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResetSessionTokenRetryPolicyFactory.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.caches.RxClientCollectionCache; +import com.azure.cosmos.internal.caches.RxClientCollectionCache; +import com.azure.cosmos.internal.caches.RxClientCollectionCache; public class ResetSessionTokenRetryPolicyFactory implements IRetryPolicyFactory { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResourceId.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResourceId.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResourceId.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResourceId.java index 59f272040038..92339b98ab9c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResourceId.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResourceId.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResourceResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResourceResponse.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResourceResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResourceResponse.java index 441a02ad02a2..db72555ad57c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResourceResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResourceResponse.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.CosmosResponseDiagnostics; -import com.azure.data.cosmos.Resource; +import com.azure.cosmos.CosmosResponseDiagnostics; +import com.azure.cosmos.Resource; import org.apache.commons.lang3.StringUtils; import java.time.Duration; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResourceThrottleRetryPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResourceThrottleRetryPolicy.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResourceThrottleRetryPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResourceThrottleRetryPolicy.java index 5a849eeab5ee..b3ce3c8594fc 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResourceThrottleRetryPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResourceThrottleRetryPolicy.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosClientException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResourceTokenAuthorizationHelper.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResourceTokenAuthorizationHelper.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResourceTokenAuthorizationHelper.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResourceTokenAuthorizationHelper.java index 75e271572e68..497d88903492 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResourceTokenAuthorizationHelper.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResourceTokenAuthorizationHelper.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.routing.PartitionKeyAndResourceTokenPair; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.routing.PartitionKeyAndResourceTokenPair; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.routing.PartitionKeyAndResourceTokenPair; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; import org.apache.commons.lang3.tuple.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResourceType.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResourceType.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResourceType.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResourceType.java index f0bfb957f0c7..bdb7a34308c6 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/ResourceType.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/ResourceType.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; /** * Resource types in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RetryPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RetryPolicy.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RetryPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RetryPolicy.java index ee8cf2e72df3..8c2250260691 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RetryPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RetryPolicy.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.RetryOptions; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.RetryOptions; /** * While this class is public, but it is not part of our published public APIs. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RetryUtils.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RetryUtils.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RetryUtils.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RetryUtils.java index e58cc6546436..38f133884454 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RetryUtils.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RetryUtils.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import org.apache.commons.lang3.time.StopWatch; import org.slf4j.Logger; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RuntimeConstants.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RuntimeConstants.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RuntimeConstants.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RuntimeConstants.java index 62e94b134c24..8b318dc66887 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RuntimeConstants.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RuntimeConstants.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; /** * Used internally. Runtime constants in the Azure Cosmos DB database service Java SDK. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RuntimeExecutionTimes.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RuntimeExecutionTimes.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RuntimeExecutionTimes.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RuntimeExecutionTimes.java index b92ffb837a4c..9c11f0a01fa6 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RuntimeExecutionTimes.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RuntimeExecutionTimes.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import java.time.Duration; import java.util.Collection; @@ -136,4 +136,4 @@ String toTextString(int indentLevel) { return stringBuilder.toString(); } -} \ No newline at end of file +} diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RxDocumentClientImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RxDocumentClientImpl.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RxDocumentClientImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RxDocumentClientImpl.java index 29cd4f267f8c..e68e6cd580d6 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RxDocumentClientImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RxDocumentClientImpl.java @@ -1,40 +1,56 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - -import com.azure.data.cosmos.AccessConditionType; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ChangeFeedOptions; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosKeyCredential; -import com.azure.data.cosmos.CosmosResourceType; -import com.azure.data.cosmos.DatabaseAccount; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.JsonSerializable; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.SqlQuerySpec; -import com.azure.data.cosmos.TokenResolver; -import com.azure.data.cosmos.internal.caches.RxClientCollectionCache; -import com.azure.data.cosmos.internal.caches.RxCollectionCache; -import com.azure.data.cosmos.internal.caches.RxPartitionKeyRangeCache; -import com.azure.data.cosmos.internal.directconnectivity.GatewayServiceConfigurationReader; -import com.azure.data.cosmos.internal.directconnectivity.GlobalAddressResolver; -import com.azure.data.cosmos.internal.directconnectivity.ServerStoreModel; -import com.azure.data.cosmos.internal.directconnectivity.StoreClient; -import com.azure.data.cosmos.internal.directconnectivity.StoreClientFactory; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.http.HttpClientConfig; -import com.azure.data.cosmos.internal.query.DocumentQueryExecutionContextFactory; -import com.azure.data.cosmos.internal.query.IDocumentQueryClient; -import com.azure.data.cosmos.internal.query.IDocumentQueryExecutionContext; -import com.azure.data.cosmos.internal.query.Paginator; -import com.azure.data.cosmos.internal.routing.PartitionKeyAndResourceTokenPair; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternal; +package com.azure.cosmos.internal; + +import com.azure.cosmos.internal.caches.RxClientCollectionCache; +import com.azure.cosmos.internal.caches.RxCollectionCache; +import com.azure.cosmos.internal.caches.RxPartitionKeyRangeCache; +import com.azure.cosmos.internal.directconnectivity.GatewayServiceConfigurationReader; +import com.azure.cosmos.internal.directconnectivity.GlobalAddressResolver; +import com.azure.cosmos.internal.directconnectivity.ServerStoreModel; +import com.azure.cosmos.internal.directconnectivity.StoreClient; +import com.azure.cosmos.internal.directconnectivity.StoreClientFactory; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpClientConfig; +import com.azure.cosmos.internal.query.DocumentQueryExecutionContextFactory; +import com.azure.cosmos.internal.query.IDocumentQueryClient; +import com.azure.cosmos.internal.query.IDocumentQueryExecutionContext; +import com.azure.cosmos.internal.query.Paginator; +import com.azure.cosmos.internal.routing.PartitionKeyAndResourceTokenPair; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.AccessConditionType; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ChangeFeedOptions; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosKeyCredential; +import com.azure.cosmos.CosmosResourceType; +import com.azure.cosmos.DatabaseAccount; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.JsonSerializable; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.Resource; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.TokenResolver; +import com.azure.cosmos.internal.caches.RxClientCollectionCache; +import com.azure.cosmos.internal.caches.RxCollectionCache; +import com.azure.cosmos.internal.caches.RxPartitionKeyRangeCache; +import com.azure.cosmos.internal.directconnectivity.GatewayServiceConfigurationReader; +import com.azure.cosmos.internal.directconnectivity.GlobalAddressResolver; +import com.azure.cosmos.internal.directconnectivity.ServerStoreModel; +import com.azure.cosmos.internal.directconnectivity.StoreClient; +import com.azure.cosmos.internal.directconnectivity.StoreClientFactory; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpClientConfig; +import com.azure.cosmos.internal.query.DocumentQueryExecutionContextFactory; +import com.azure.cosmos.internal.query.IDocumentQueryClient; +import com.azure.cosmos.internal.query.IDocumentQueryExecutionContext; +import com.azure.cosmos.internal.query.Paginator; +import com.azure.cosmos.internal.routing.PartitionKeyAndResourceTokenPair; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.lang3.StringUtils; @@ -57,12 +73,12 @@ import java.util.function.BiFunction; import java.util.function.Function; -import static com.azure.data.cosmos.BridgeInternal.documentFromObject; -import static com.azure.data.cosmos.BridgeInternal.getAltLink; -import static com.azure.data.cosmos.BridgeInternal.toDatabaseAccount; -import static com.azure.data.cosmos.BridgeInternal.toFeedResponsePage; -import static com.azure.data.cosmos.BridgeInternal.toResourceResponse; -import static com.azure.data.cosmos.BridgeInternal.toStoredProcedureResponse; +import static com.azure.cosmos.BridgeInternal.documentFromObject; +import static com.azure.cosmos.BridgeInternal.getAltLink; +import static com.azure.cosmos.BridgeInternal.toDatabaseAccount; +import static com.azure.cosmos.BridgeInternal.toFeedResponsePage; +import static com.azure.cosmos.BridgeInternal.toResourceResponse; +import static com.azure.cosmos.BridgeInternal.toStoredProcedureResponse; /** * While this class is public, but it is not part of our published public APIs. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RxDocumentServiceRequest.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RxDocumentServiceRequest.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RxDocumentServiceRequest.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RxDocumentServiceRequest.java index 2d1b513dbb38..0906854ef74f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RxDocumentServiceRequest.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RxDocumentServiceRequest.java @@ -1,14 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - -import com.azure.data.cosmos.ChangeFeedOptions; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.SqlQuerySpec; -import com.azure.data.cosmos.internal.directconnectivity.WFConstants; -import com.azure.data.cosmos.internal.routing.PartitionKeyRangeIdentity; +package com.azure.cosmos.internal; + +import com.azure.cosmos.internal.directconnectivity.WFConstants; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; +import com.azure.cosmos.ChangeFeedOptions; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.Resource; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.directconnectivity.WFConstants; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import reactor.core.publisher.Flux; @@ -351,7 +353,7 @@ public static RxDocumentServiceRequest create(OperationType operation, String relativePath, Resource resource, Map headers) { - return RxDocumentServiceRequest.create(operation, resourceType, relativePath, resource, headers, (RequestOptions)null); + return create(operation, resourceType, relativePath, resource, headers, (RequestOptions)null); } /** @@ -477,7 +479,7 @@ public static RxDocumentServiceRequest create(OperationType operation, ResourceType resourceType, String relativePath, Map headers) { - return RxDocumentServiceRequest.create(operation, resourceType, relativePath, headers, (RequestOptions)null); + return create(operation, resourceType, relativePath, headers, (RequestOptions)null); } /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RxDocumentServiceResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RxDocumentServiceResponse.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RxDocumentServiceResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RxDocumentServiceResponse.java index 18eaf7d79774..a46c0ac63057 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RxDocumentServiceResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RxDocumentServiceResponse.java @@ -1,13 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosResponseDiagnostics; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.directconnectivity.Address; -import com.azure.data.cosmos.internal.directconnectivity.StoreResponse; +package com.azure.cosmos.internal; + +import com.azure.cosmos.internal.directconnectivity.Address; +import com.azure.cosmos.internal.directconnectivity.StoreResponse; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosResponseDiagnostics; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.directconnectivity.Address; +import com.azure.cosmos.internal.directconnectivity.StoreResponse; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RxGatewayStoreModel.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RxGatewayStoreModel.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RxGatewayStoreModel.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RxGatewayStoreModel.java index d1032c29c730..a1cb3fec8c92 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RxGatewayStoreModel.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RxGatewayStoreModel.java @@ -1,18 +1,24 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.CosmosError; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.directconnectivity.StoreResponse; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.http.HttpHeaders; -import com.azure.data.cosmos.internal.http.HttpRequest; -import com.azure.data.cosmos.internal.http.HttpResponse; +package com.azure.cosmos.internal; + + +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.directconnectivity.StoreResponse; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.internal.http.HttpResponse; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosError; +import com.azure.cosmos.internal.directconnectivity.HttpUtils; +import com.azure.cosmos.internal.directconnectivity.StoreResponse; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.internal.http.HttpResponse; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.HttpMethod; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RxStoreModel.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RxStoreModel.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RxStoreModel.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RxStoreModel.java index 606eff43d87c..14a8cb8e2389 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/RxStoreModel.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/RxStoreModel.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/SessionContainer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/SessionContainer.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/SessionContainer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/SessionContainer.java index e701d77a39a5..401e9969c939 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/SessionContainer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/SessionContainer.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosClientException; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,7 +14,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantReadWriteLock; -import static com.azure.data.cosmos.internal.Utils.ValueHolder; +import static com.azure.cosmos.internal.Utils.ValueHolder; /** * Used internally to cache the collections' session tokens in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/SessionTokenHelper.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/SessionTokenHelper.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/SessionTokenHelper.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/SessionTokenHelper.java index ebb09a508dfd..9af9aec37619 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/SessionTokenHelper.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/SessionTokenHelper.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BadRequestException; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.InternalServerErrorException; +import com.azure.cosmos.BadRequestException; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.InternalServerErrorException; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; @@ -15,7 +15,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import static com.azure.data.cosmos.internal.Utils.ValueHolder; +import static com.azure.cosmos.internal.Utils.ValueHolder; /** * Used internally to provides helper functions to work with session tokens in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/StoredProcedure.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/StoredProcedure.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/StoredProcedure.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/StoredProcedure.java index e4dfaee1af9d..c6d69f99125c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/StoredProcedure.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/StoredProcedure.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.Resource; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.Resource; /** * Represents a stored procedure in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/StoredProcedureResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/StoredProcedureResponse.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/StoredProcedureResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/StoredProcedureResponse.java index c599a343e29a..61862641900e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/StoredProcedureResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/StoredProcedureResponse.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.CosmosResponseDiagnostics; +import com.azure.cosmos.CosmosResponseDiagnostics; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Strings.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Strings.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Strings.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Strings.java index 9cf5763ceb14..ee08c9e34bfc 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Strings.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Strings.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/TestConfigurations.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/TestConfigurations.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/TestConfigurations.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/TestConfigurations.java index ac054f5c99be..3bdceaa53d66 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/TestConfigurations.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/TestConfigurations.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Trigger.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Trigger.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Trigger.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Trigger.java index 2b2315afe7b9..a7356dec10cb 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Trigger.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Trigger.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.TriggerOperation; -import com.azure.data.cosmos.TriggerType; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.Resource; +import com.azure.cosmos.TriggerOperation; +import com.azure.cosmos.TriggerType; import org.apache.commons.lang3.StringUtils; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Undefined.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Undefined.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Undefined.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Undefined.java index 524a66905be1..ddf6d0e5a2eb 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Undefined.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Undefined.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.JsonSerializable; +import com.azure.cosmos.JsonSerializable; /** * Represents the 'Undefined' partition key in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/User.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/User.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/User.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/User.java index 412fc44a1e7d..b06b6c4aabdc 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/User.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/User.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.Resource; +import com.azure.cosmos.Resource; /** * Represents a database user in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/UserAgentContainer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/UserAgentContainer.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/UserAgentContainer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/UserAgentContainer.java index cb502565dd12..102fdced7912 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/UserAgentContainer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/UserAgentContainer.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; /** * Used internally. The user agent object, which is used to track the version of the Java SDK of the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/UserDefinedFunction.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/UserDefinedFunction.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/UserDefinedFunction.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/UserDefinedFunction.java index e183618b060e..4d25cdba320c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/UserDefinedFunction.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/UserDefinedFunction.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.Resource; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.Resource; /** * Represents a user defined function in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Utils.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Utils.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Utils.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Utils.java index 8139279de910..bb0be377e70e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/Utils.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/Utils.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BadRequestException; -import com.azure.data.cosmos.ConsistencyLevel; +import com.azure.cosmos.BadRequestException; +import com.azure.cosmos.ConsistencyLevel; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/VectorSessionToken.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/VectorSessionToken.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/VectorSessionToken.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/VectorSessionToken.java index 1d572e5d8cf1..a3e30ec3ee30 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/VectorSessionToken.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/VectorSessionToken.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.InternalServerErrorException; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.InternalServerErrorException; import org.apache.commons.collections4.map.UnmodifiableMap; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -16,7 +16,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static com.azure.data.cosmos.internal.Utils.ValueHolder; +import static com.azure.cosmos.internal.Utils.ValueHolder; /** * Models vector clock bases session token. SESSION token has the following format: diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/WebExceptionRetryPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/WebExceptionRetryPolicy.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/WebExceptionRetryPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/WebExceptionRetryPolicy.java index 74ead9b3eb29..c78a44c45462 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/WebExceptionRetryPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/WebExceptionRetryPolicy.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.directconnectivity.WebExceptionUtility; +import com.azure.cosmos.internal.directconnectivity.WebExceptionUtility; +import com.azure.cosmos.internal.directconnectivity.WebExceptionUtility; import org.apache.commons.lang3.time.StopWatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/AsyncCache.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/AsyncCache.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/AsyncCache.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/AsyncCache.java index 37d4dd0b2a9e..36acbf7de32a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/AsyncCache.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/AsyncCache.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.caches; +package com.azure.cosmos.internal.caches; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/AsyncLazy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/AsyncLazy.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/AsyncLazy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/AsyncLazy.java index 9ccc6a6d07c8..b5e866fdbfbf 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/AsyncLazy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/AsyncLazy.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.caches; +package com.azure.cosmos.internal.caches; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/IEqualityComparer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/IEqualityComparer.java similarity index 79% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/IEqualityComparer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/IEqualityComparer.java index e206da95e8fa..1d7a9069e0da 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/IEqualityComparer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/IEqualityComparer.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.caches; +package com.azure.cosmos.internal.caches; interface IEqualityComparer { boolean areEqual(TValue v1, TValue v2); diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/IPartitionKeyRangeCache.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/IPartitionKeyRangeCache.java similarity index 64% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/IPartitionKeyRangeCache.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/IPartitionKeyRangeCache.java index 48538b5fdb0b..1f2645c90042 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/IPartitionKeyRangeCache.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/IPartitionKeyRangeCache.java @@ -1,12 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.caches; - -import com.azure.data.cosmos.internal.ICollectionRoutingMapCache; -import com.azure.data.cosmos.internal.IRoutingMapProvider; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.routing.CollectionRoutingMap; -import com.azure.data.cosmos.internal.routing.Range; +package com.azure.cosmos.internal.caches; + +import com.azure.cosmos.internal.routing.CollectionRoutingMap; +import com.azure.cosmos.internal.routing.Range; +import com.azure.cosmos.internal.ICollectionRoutingMapCache; +import com.azure.cosmos.internal.IRoutingMapProvider; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.routing.CollectionRoutingMap; +import com.azure.cosmos.internal.routing.Range; import reactor.core.publisher.Mono; import java.util.List; @@ -20,11 +22,11 @@ public interface IPartitionKeyRangeCache extends IRoutingMapProvider, ICollectio Mono tryLookupAsync(String collectionRid, CollectionRoutingMap previousValue, Map properties); Mono> tryGetOverlappingRangesAsync(String collectionRid, Range range, boolean forceRefresh, - Map properties); + Map properties); Mono tryGetPartitionKeyRangeByIdAsync(String collectionResourceId, String partitionKeyRangeId, boolean forceRefresh, Map properties); Mono tryGetRangeByPartitionKeyRangeId(String collectionRid, String partitionKeyRangeId, Map properties); -} \ No newline at end of file +} diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/RxClientCollectionCache.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/RxClientCollectionCache.java similarity index 78% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/RxClientCollectionCache.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/RxClientCollectionCache.java index 2a2a45539590..7d1e59543566 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/RxClientCollectionCache.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/RxClientCollectionCache.java @@ -1,24 +1,24 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.caches; +package com.azure.cosmos.internal.caches; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.internal.ISessionContainer; -import com.azure.data.cosmos.internal.AuthorizationTokenType; -import com.azure.data.cosmos.internal.ClearingSessionContainerClientRetryPolicy; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.IDocumentClientRetryPolicy; -import com.azure.data.cosmos.internal.IRetryPolicyFactory; -import com.azure.data.cosmos.internal.ObservableHelper; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.PathsHelper; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.RxDocumentServiceResponse; -import com.azure.data.cosmos.internal.RxStoreModel; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.ISessionContainer; +import com.azure.cosmos.internal.AuthorizationTokenType; +import com.azure.cosmos.internal.ClearingSessionContainerClientRetryPolicy; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.IDocumentClientRetryPolicy; +import com.azure.cosmos.internal.IRetryPolicyFactory; +import com.azure.cosmos.internal.ObservableHelper; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.PathsHelper; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.RxDocumentServiceResponse; +import com.azure.cosmos.internal.RxStoreModel; +import com.azure.cosmos.internal.Utils; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/RxCollectionCache.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/RxCollectionCache.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/RxCollectionCache.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/RxCollectionCache.java index 06924ca848b3..e49195baecd2 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/RxCollectionCache.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/RxCollectionCache.java @@ -1,15 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.caches; - -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.InvalidPartitionException; -import com.azure.data.cosmos.NotFoundException; -import com.azure.data.cosmos.internal.PathsHelper; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.ResourceId; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.routing.PartitionKeyRangeIdentity; +package com.azure.cosmos.internal.caches; + +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.InvalidPartitionException; +import com.azure.cosmos.NotFoundException; +import com.azure.cosmos.internal.PathsHelper; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.ResourceId; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; import org.apache.commons.lang3.StringUtils; import reactor.core.Exceptions; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/RxPartitionKeyRangeCache.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/RxPartitionKeyRangeCache.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/RxPartitionKeyRangeCache.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/RxPartitionKeyRangeCache.java index cfa43b4ac31b..b9382fa7e7fa 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/caches/RxPartitionKeyRangeCache.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/caches/RxPartitionKeyRangeCache.java @@ -1,23 +1,26 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.caches; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.NotFoundException; -import com.azure.data.cosmos.internal.Exceptions; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.Utils; -import com.azure.data.cosmos.internal.routing.CollectionRoutingMap; -import com.azure.data.cosmos.internal.routing.IServerIdentity; -import com.azure.data.cosmos.internal.routing.InMemoryCollectionRoutingMap; -import com.azure.data.cosmos.internal.routing.Range; +package com.azure.cosmos.internal.caches; + +import com.azure.cosmos.internal.routing.CollectionRoutingMap; +import com.azure.cosmos.internal.routing.InMemoryCollectionRoutingMap; +import com.azure.cosmos.internal.routing.Range; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.NotFoundException; +import com.azure.cosmos.internal.Exceptions; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.routing.CollectionRoutingMap; +import com.azure.cosmos.internal.routing.IServerIdentity; +import com.azure.cosmos.internal.routing.InMemoryCollectionRoutingMap; +import com.azure.cosmos.internal.routing.Range; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.slf4j.Logger; @@ -49,7 +52,7 @@ public RxPartitionKeyRangeCache(AsyncDocumentClient client, RxCollectionCache co } /* (non-Javadoc) - * @see IPartitionKeyRangeCache#tryLookupAsync(java.lang.STRING, com.azure.data.cosmos.internal.routing.CollectionRoutingMap) + * @see IPartitionKeyRangeCache#tryLookupAsync(java.lang.STRING, com.azure.cosmos.internal.routing.CollectionRoutingMap) */ @Override public Mono tryLookupAsync(String collectionRid, CollectionRoutingMap previousValue, Map properties) { @@ -75,11 +78,11 @@ public Mono tryLookupAsync(String collectionRid, Collectio } /* (non-Javadoc) - * @see IPartitionKeyRangeCache#tryGetOverlappingRangesAsync(java.lang.STRING, com.azure.data.cosmos.internal.routing.RANGE, boolean) + * @see IPartitionKeyRangeCache#tryGetOverlappingRangesAsync(java.lang.STRING, com.azure.cosmos.internal.routing.RANGE, boolean) */ @Override public Mono> tryGetOverlappingRangesAsync(String collectionRid, Range range, boolean forceRefresh, - Map properties) { + Map properties) { Mono routingMapObs = tryLookupAsync(collectionRid, null, properties); diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/Bootstrapper.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/Bootstrapper.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/Bootstrapper.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/Bootstrapper.java index e55551449a68..3d3d1860cdf5 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/Bootstrapper.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/Bootstrapper.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/CancellationToken.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/CancellationToken.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/CancellationToken.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/CancellationToken.java index 0308111f67cb..08bd78ab17dd 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/CancellationToken.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/CancellationToken.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; /** * Propagates notification that operations should be canceled.. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/CancellationTokenSource.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/CancellationTokenSource.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/CancellationTokenSource.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/CancellationTokenSource.java index ccf82560e5a4..769e84499693 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/CancellationTokenSource.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/CancellationTokenSource.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import java.io.Closeable; import java.io.IOException; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ChangeFeedContextClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ChangeFeedContextClient.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ChangeFeedContextClient.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ChangeFeedContextClient.java index 731bfd96de24..a3ebf6fde176 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ChangeFeedContextClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ChangeFeedContextClient.java @@ -1,10 +1,23 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncContainer; -import com.azure.data.cosmos.internal.PartitionKeyRange; +package com.azure.cosmos.internal.changefeed; + +import com.azure.cosmos.ChangeFeedOptions; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncContainerResponse; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosAsyncDatabaseResponse; +import com.azure.cosmos.CosmosAsyncItem; +import com.azure.cosmos.CosmosAsyncItemResponse; +import com.azure.cosmos.CosmosContainerProperties; +import com.azure.cosmos.CosmosContainerRequestOptions; +import com.azure.cosmos.CosmosDatabaseRequestOptions; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.PartitionKeyRange; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ChangeFeedObserver.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ChangeFeedObserver.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ChangeFeedObserver.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ChangeFeedObserver.java index 39adb35794db..4ac3b1d12c60 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ChangeFeedObserver.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ChangeFeedObserver.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; -import com.azure.data.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosItemProperties; import reactor.core.publisher.Mono; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ChangeFeedObserverCloseReason.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ChangeFeedObserverCloseReason.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ChangeFeedObserverCloseReason.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ChangeFeedObserverCloseReason.java index b9b8907e208b..12a04c69ea3b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ChangeFeedObserverCloseReason.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ChangeFeedObserverCloseReason.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; /** * The reason for the {@link ChangeFeedObserver} to close. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ChangeFeedObserverContext.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ChangeFeedObserverContext.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ChangeFeedObserverContext.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ChangeFeedObserverContext.java index 1e408ed9eb91..6e6cbe951270 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ChangeFeedObserverContext.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ChangeFeedObserverContext.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; -import com.azure.data.cosmos.CosmosItemProperties; -import com.azure.data.cosmos.FeedResponse; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.FeedResponse; import reactor.core.publisher.Mono; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ChangeFeedObserverFactory.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ChangeFeedObserverFactory.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ChangeFeedObserverFactory.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ChangeFeedObserverFactory.java index 4d7c6dcd6438..9aeef34cea72 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ChangeFeedObserverFactory.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ChangeFeedObserverFactory.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; /** * Factory class used to create instance(s) of {@link ChangeFeedObserver}. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/CheckpointFrequency.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/CheckpointFrequency.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/CheckpointFrequency.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/CheckpointFrequency.java index c0c2ab79ad04..473a05cf355f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/CheckpointFrequency.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/CheckpointFrequency.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import java.time.Duration; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/HealthMonitor.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/HealthMonitor.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/HealthMonitor.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/HealthMonitor.java index 886a40fc1be5..5eb8d40bc65c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/HealthMonitor.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/HealthMonitor.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/HealthMonitoringRecord.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/HealthMonitoringRecord.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/HealthMonitoringRecord.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/HealthMonitoringRecord.java index df581dd3da32..e3758a15a934 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/HealthMonitoringRecord.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/HealthMonitoringRecord.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; /** * A record used in the health monitoring. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/Lease.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/Lease.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/Lease.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/Lease.java index 0821b486ee53..9106def4897e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/Lease.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/Lease.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; -import com.azure.data.cosmos.ChangeFeedProcessor; +import com.azure.cosmos.ChangeFeedProcessor; import java.time.ZonedDateTime; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseCheckpointer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseCheckpointer.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseCheckpointer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseCheckpointer.java index a25fec81228e..2d04d2f00d1f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseCheckpointer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseCheckpointer.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseContainer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseContainer.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseContainer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseContainer.java index 3e68ee914260..affb4cecd2bd 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseContainer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseContainer.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseManager.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseManager.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseManager.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseManager.java index ba99b7f97257..5d0cf5406b4d 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseManager.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseManager.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; -import com.azure.data.cosmos.internal.changefeed.exceptions.LeaseLostException; +import com.azure.cosmos.internal.changefeed.exceptions.LeaseLostException; import reactor.core.publisher.Mono; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseRenewer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseRenewer.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseRenewer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseRenewer.java index 1e15846ab8f5..94bfa61cea5a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseRenewer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseRenewer.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseStore.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseStore.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseStore.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseStore.java index 98e47f36045a..a2e4a9c455f4 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseStore.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseStore.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseStoreManager.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseStoreManager.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseStoreManager.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseStoreManager.java index b196dc8e4ca5..f5e15aa419af 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseStoreManager.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseStoreManager.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; -import com.azure.data.cosmos.CosmosAsyncContainer; -import com.azure.data.cosmos.internal.changefeed.implementation.LeaseStoreManagerImpl; +import com.azure.cosmos.internal.changefeed.implementation.LeaseStoreManagerImpl; +import com.azure.cosmos.CosmosAsyncContainer; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseStoreManagerSettings.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseStoreManagerSettings.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseStoreManagerSettings.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseStoreManagerSettings.java index 456e42489d96..01e57492fa96 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/LeaseStoreManagerSettings.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/LeaseStoreManagerSettings.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; -import com.azure.data.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncContainer; /** * Captures LeaseStoreManager properties. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionCheckpointer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionCheckpointer.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionCheckpointer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionCheckpointer.java index 1517b68f28c9..44fb8aa3ba20 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionCheckpointer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionCheckpointer.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionController.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionController.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionController.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionController.java index 8b16e7961bce..a05fc9ad9cf6 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionController.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionController.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionLoadBalancer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionLoadBalancer.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionLoadBalancer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionLoadBalancer.java index d34638851d38..46331d699cfb 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionLoadBalancer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionLoadBalancer.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionLoadBalancingStrategy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionLoadBalancingStrategy.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionLoadBalancingStrategy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionLoadBalancingStrategy.java index d30e86d280c6..998d09ff0f03 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionLoadBalancingStrategy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionLoadBalancingStrategy.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; -import com.azure.data.cosmos.ChangeFeedProcessorOptions; +import com.azure.cosmos.ChangeFeedProcessorOptions; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionManager.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionManager.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionManager.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionManager.java index be26a4bd050a..eddcae335050 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionManager.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionManager.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionProcessor.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionProcessor.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionProcessor.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionProcessor.java index e5a0fd8ce758..d7b01eea0d3b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionProcessor.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionProcessor.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionProcessorFactory.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionProcessorFactory.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionProcessorFactory.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionProcessorFactory.java index 58b3849992aa..899139ef728e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionProcessorFactory.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionProcessorFactory.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; /** * Factory class used to create instance(s) of {@link PartitionProcessor}. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionSupervisor.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionSupervisor.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionSupervisor.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionSupervisor.java index 2817c548985e..40dea5747221 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionSupervisor.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionSupervisor.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionSupervisorFactory.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionSupervisorFactory.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionSupervisorFactory.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionSupervisorFactory.java index d96404ed8944..ce34a2f8a911 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionSupervisorFactory.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionSupervisorFactory.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; /** * Interface for the partition supervisor factory. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionSynchronizer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionSynchronizer.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionSynchronizer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionSynchronizer.java index ab15b5c8bf32..ec1732572021 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/PartitionSynchronizer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/PartitionSynchronizer.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ProcessorSettings.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ProcessorSettings.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ProcessorSettings.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ProcessorSettings.java index 7fcf643a28f5..82e83768d2fb 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ProcessorSettings.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ProcessorSettings.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; -import com.azure.data.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncContainer; import java.time.Duration; import java.time.OffsetDateTime; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/RemainingPartitionWork.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/RemainingPartitionWork.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/RemainingPartitionWork.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/RemainingPartitionWork.java index e94109a20e12..57be4b4718de 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/RemainingPartitionWork.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/RemainingPartitionWork.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; /** * Interface for remaining partition work. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/RemainingWorkEstimator.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/RemainingWorkEstimator.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/RemainingWorkEstimator.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/RemainingWorkEstimator.java index 9a60de9a2d85..0a14e7cc61b8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/RemainingWorkEstimator.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/RemainingWorkEstimator.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/RequestOptionsFactory.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/RequestOptionsFactory.java similarity index 69% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/RequestOptionsFactory.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/RequestOptionsFactory.java index 227be1572323..9a9142bf8621 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/RequestOptionsFactory.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/RequestOptionsFactory.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; -import com.azure.data.cosmos.CosmosItemRequestOptions; -import com.azure.data.cosmos.FeedOptions; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.FeedOptions; /** * Defines request options for lease requests to use with {@link LeaseStoreManager}. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ServiceItemLease.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ServiceItemLease.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ServiceItemLease.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ServiceItemLease.java index 5cb1f912d904..bb7f5ca653be 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ServiceItemLease.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ServiceItemLease.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; -import com.azure.data.cosmos.CosmosItemProperties; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.Constants; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -14,7 +14,7 @@ import java.util.HashMap; import java.util.Map; -//import com.azure.data.cosmos.internal.changefeed.internal.Constants; +//import com.azure.cosmos.internal.changefeed.internal.Constants; /** * Document service lease. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ServiceItemLeaseUpdater.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ServiceItemLeaseUpdater.java similarity index 73% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ServiceItemLeaseUpdater.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ServiceItemLeaseUpdater.java index a87582279e47..44e710a78120 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/ServiceItemLeaseUpdater.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/ServiceItemLeaseUpdater.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed; +package com.azure.cosmos.internal.changefeed; -import com.azure.data.cosmos.CosmosAsyncItem; -import com.azure.data.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.CosmosAsyncItem; +import com.azure.cosmos.CosmosItemRequestOptions; import reactor.core.publisher.Mono; import java.util.function.Function; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/LeaseLostException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/LeaseLostException.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/LeaseLostException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/LeaseLostException.java index fd58128e3989..0a7f2a4da186 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/LeaseLostException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/LeaseLostException.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.exceptions; +package com.azure.cosmos.internal.changefeed.exceptions; -import com.azure.data.cosmos.internal.changefeed.Lease; +import com.azure.cosmos.internal.changefeed.Lease; /** * Exception occurred when lease is lost, that would typically happen when it is taken by another host. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/ObserverException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/ObserverException.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/ObserverException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/ObserverException.java index 7a7784286689..cf87e0bb0d37 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/ObserverException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/ObserverException.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.exceptions; +package com.azure.cosmos.internal.changefeed.exceptions; /** * Exception occurred when an operation in a ChangeFeedObserver is running and throws by user code. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/PartitionException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/PartitionException.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/PartitionException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/PartitionException.java index 5f79dd9fa63e..b763a5606dbc 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/PartitionException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/PartitionException.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.exceptions; +package com.azure.cosmos.internal.changefeed.exceptions; /** * General exception occurred during partition processing. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/PartitionNotFoundException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/PartitionNotFoundException.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/PartitionNotFoundException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/PartitionNotFoundException.java index 160c80e7bf98..fe78e1e52f07 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/PartitionNotFoundException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/PartitionNotFoundException.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.exceptions; +package com.azure.cosmos.internal.changefeed.exceptions; /** * Exception occurred when partition wasn't found. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/PartitionSplitException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/PartitionSplitException.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/PartitionSplitException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/PartitionSplitException.java index 748f2b80f3ce..ddabb6cd3835 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/PartitionSplitException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/PartitionSplitException.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.exceptions; +package com.azure.cosmos.internal.changefeed.exceptions; /** * Exception occurred during partition split. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/TaskCancelledException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/TaskCancelledException.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/TaskCancelledException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/TaskCancelledException.java index ccd4a9579b85..a805d5574488 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/exceptions/TaskCancelledException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/exceptions/TaskCancelledException.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.exceptions; +package com.azure.cosmos.internal.changefeed.exceptions; /** * Exception occurred when an operation in a ChangeFeedObserver was canceled. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/AutoCheckpointer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/AutoCheckpointer.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/AutoCheckpointer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/AutoCheckpointer.java index b064834a1c1b..f1a914b3a0bc 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/AutoCheckpointer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/AutoCheckpointer.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.CosmosItemProperties; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserver; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserverCloseReason; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserverContext; -import com.azure.data.cosmos.internal.changefeed.CheckpointFrequency; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserver; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserverCloseReason; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserverContext; +import com.azure.cosmos.internal.changefeed.CheckpointFrequency; import reactor.core.publisher.Mono; import java.time.Duration; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/BootstrapperImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/BootstrapperImpl.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/BootstrapperImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/BootstrapperImpl.java index ab4b5385d56a..0da3b49fab23 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/BootstrapperImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/BootstrapperImpl.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.internal.changefeed.Bootstrapper; -import com.azure.data.cosmos.internal.changefeed.LeaseStore; -import com.azure.data.cosmos.internal.changefeed.PartitionSynchronizer; +import com.azure.cosmos.internal.changefeed.Bootstrapper; +import com.azure.cosmos.internal.changefeed.LeaseStore; +import com.azure.cosmos.internal.changefeed.PartitionSynchronizer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ChangeFeedContextClientImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ChangeFeedContextClientImpl.java similarity index 83% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ChangeFeedContextClientImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ChangeFeedContextClientImpl.java index 2815df4e6a52..161d1e4a5cd2 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ChangeFeedContextClientImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ChangeFeedContextClientImpl.java @@ -1,12 +1,25 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.CosmosAsyncDatabase; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedContextClient; +package com.azure.cosmos.internal.changefeed.implementation; + +import com.azure.cosmos.ChangeFeedOptions; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncContainerResponse; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosAsyncDatabaseResponse; +import com.azure.cosmos.CosmosAsyncItem; +import com.azure.cosmos.CosmosAsyncItemResponse; +import com.azure.cosmos.CosmosContainerProperties; +import com.azure.cosmos.CosmosContainerRequestOptions; +import com.azure.cosmos.CosmosDatabaseRequestOptions; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.changefeed.ChangeFeedContextClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Flux; @@ -16,7 +29,7 @@ import java.net.URI; -import static com.azure.data.cosmos.CosmosBridgeInternal.getContextClient; +import static com.azure.cosmos.CosmosBridgeInternal.getContextClient; /** * Implementation for ChangeFeedDocumentClient. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ChangeFeedHelper.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ChangeFeedHelper.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ChangeFeedHelper.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ChangeFeedHelper.java index a4280cc3d4fb..7d681e722e87 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ChangeFeedHelper.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ChangeFeedHelper.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; import java.net.MalformedURLException; import java.net.URI; @@ -8,9 +8,9 @@ import java.net.URL; import java.util.Map; -import static com.azure.data.cosmos.internal.changefeed.implementation.ChangeFeedHelper.Paths.COLLECTIONS_PATH_SEGMENT; -import static com.azure.data.cosmos.internal.changefeed.implementation.ChangeFeedHelper.Paths.DATABASES_ROOT; -import static com.azure.data.cosmos.internal.changefeed.implementation.ChangeFeedHelper.Paths.DOCUMENTS_PATH_SEGMENT; +import static com.azure.cosmos.internal.changefeed.implementation.ChangeFeedHelper.Paths.COLLECTIONS_PATH_SEGMENT; +import static com.azure.cosmos.internal.changefeed.implementation.ChangeFeedHelper.Paths.DATABASES_ROOT; +import static com.azure.cosmos.internal.changefeed.implementation.ChangeFeedHelper.Paths.DOCUMENTS_PATH_SEGMENT; /** * Implement static methods used for various simple transformations and tasks. @@ -92,7 +92,7 @@ public static String getUrlPath(String path) { } /** - * Copied from com.azure.data.cosmos.internal.Paths. + * Copied from com.azure.cosmos.internal.Paths. */ public static class Paths { static final String ROOT = "/"; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ChangeFeedObserverContextImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ChangeFeedObserverContextImpl.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ChangeFeedObserverContextImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ChangeFeedObserverContextImpl.java index 440cb3c88eb4..a51e76a56e7d 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ChangeFeedObserverContextImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ChangeFeedObserverContextImpl.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.CosmosItemProperties; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserverContext; -import com.azure.data.cosmos.internal.changefeed.PartitionCheckpointer; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserverContext; +import com.azure.cosmos.internal.changefeed.PartitionCheckpointer; import reactor.core.publisher.Mono; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ChangeFeedObserverFactoryImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ChangeFeedObserverFactoryImpl.java similarity index 70% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ChangeFeedObserverFactoryImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ChangeFeedObserverFactoryImpl.java index a0af85652759..3c3fa084ce3d 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ChangeFeedObserverFactoryImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ChangeFeedObserverFactoryImpl.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserver; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserverFactory; -import com.azure.data.cosmos.internal.changefeed.exceptions.ObserverException; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserver; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserverFactory; +import com.azure.cosmos.internal.changefeed.exceptions.ObserverException; /** * DEFAULT implementation for {@link ChangeFeedObserverFactory}. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ChangeFeedProcessorBuilderImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ChangeFeedProcessorBuilderImpl.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ChangeFeedProcessorBuilderImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ChangeFeedProcessorBuilderImpl.java index 31d4f407861c..e181ab214442 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ChangeFeedProcessorBuilderImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ChangeFeedProcessorBuilderImpl.java @@ -1,26 +1,26 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; - -import com.azure.data.cosmos.CosmosAsyncContainer; -import com.azure.data.cosmos.ChangeFeedProcessor; -import com.azure.data.cosmos.ChangeFeedProcessorOptions; -import com.azure.data.cosmos.CosmosItemProperties; -import com.azure.data.cosmos.internal.changefeed.Bootstrapper; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedContextClient; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserver; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserverFactory; -import com.azure.data.cosmos.internal.changefeed.CheckpointFrequency; -import com.azure.data.cosmos.internal.changefeed.HealthMonitor; -import com.azure.data.cosmos.internal.changefeed.LeaseStoreManager; -import com.azure.data.cosmos.internal.changefeed.PartitionController; -import com.azure.data.cosmos.internal.changefeed.PartitionLoadBalancer; -import com.azure.data.cosmos.internal.changefeed.PartitionLoadBalancingStrategy; -import com.azure.data.cosmos.internal.changefeed.PartitionManager; -import com.azure.data.cosmos.internal.changefeed.PartitionProcessor; -import com.azure.data.cosmos.internal.changefeed.PartitionProcessorFactory; -import com.azure.data.cosmos.internal.changefeed.PartitionSupervisorFactory; -import com.azure.data.cosmos.internal.changefeed.RequestOptionsFactory; +package com.azure.cosmos.internal.changefeed.implementation; + +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.ChangeFeedProcessor; +import com.azure.cosmos.ChangeFeedProcessorOptions; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.internal.changefeed.Bootstrapper; +import com.azure.cosmos.internal.changefeed.ChangeFeedContextClient; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserver; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserverFactory; +import com.azure.cosmos.internal.changefeed.CheckpointFrequency; +import com.azure.cosmos.internal.changefeed.HealthMonitor; +import com.azure.cosmos.internal.changefeed.LeaseStoreManager; +import com.azure.cosmos.internal.changefeed.PartitionController; +import com.azure.cosmos.internal.changefeed.PartitionLoadBalancer; +import com.azure.cosmos.internal.changefeed.PartitionLoadBalancingStrategy; +import com.azure.cosmos.internal.changefeed.PartitionManager; +import com.azure.cosmos.internal.changefeed.PartitionProcessor; +import com.azure.cosmos.internal.changefeed.PartitionProcessorFactory; +import com.azure.cosmos.internal.changefeed.PartitionSupervisorFactory; +import com.azure.cosmos.internal.changefeed.RequestOptionsFactory; import reactor.core.publisher.Mono; import reactor.core.scheduler.Scheduler; import reactor.core.scheduler.Schedulers; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/CheckpointerObserverFactory.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/CheckpointerObserverFactory.java similarity index 84% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/CheckpointerObserverFactory.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/CheckpointerObserverFactory.java index b9912d94a00f..f66ef9b67b69 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/CheckpointerObserverFactory.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/CheckpointerObserverFactory.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserver; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserverFactory; -import com.azure.data.cosmos.internal.changefeed.CheckpointFrequency; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserver; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserverFactory; +import com.azure.cosmos.internal.changefeed.CheckpointFrequency; /** * Factory class used to create instance(s) of {@link ChangeFeedObserver}. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/Constants.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/Constants.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/Constants.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/Constants.java index a6b1876736a0..d2912e0d0b67 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/Constants.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/Constants.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/DefaultObserver.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/DefaultObserver.java similarity index 79% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/DefaultObserver.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/DefaultObserver.java index cc64f34c94ca..3224fc974557 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/DefaultObserver.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/DefaultObserver.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.CosmosItemProperties; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserver; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserverCloseReason; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserverContext; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserver; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserverCloseReason; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserverContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/DefaultObserverFactory.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/DefaultObserverFactory.java similarity index 71% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/DefaultObserverFactory.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/DefaultObserverFactory.java index 21ff510e6010..08fc5fa4d1a5 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/DefaultObserverFactory.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/DefaultObserverFactory.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.CosmosItemProperties; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserver; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserverFactory; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserver; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserverFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/DocumentServiceLeaseStore.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/DocumentServiceLeaseStore.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/DocumentServiceLeaseStore.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/DocumentServiceLeaseStore.java index 0e78b0784dca..9afb92426167 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/DocumentServiceLeaseStore.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/DocumentServiceLeaseStore.java @@ -1,13 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncContainer; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedContextClient; -import com.azure.data.cosmos.internal.changefeed.LeaseStore; -import com.azure.data.cosmos.internal.changefeed.RequestOptionsFactory; -import com.azure.data.cosmos.internal.changefeed.ServiceItemLease; +package com.azure.cosmos.internal.changefeed.implementation; + +import com.azure.cosmos.AccessCondition; +import com.azure.cosmos.AccessConditionType; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosAsyncItem; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.internal.changefeed.ChangeFeedContextClient; +import com.azure.cosmos.internal.changefeed.LeaseStore; +import com.azure.cosmos.internal.changefeed.RequestOptionsFactory; +import com.azure.cosmos.internal.changefeed.ServiceItemLease; import reactor.core.publisher.Mono; import java.time.Duration; @@ -83,7 +90,7 @@ public Mono acquireInitializationLock(Duration lockExpirationTime) { String lockId = this.getStoreLockName(); CosmosItemProperties containerDocument = new CosmosItemProperties(); containerDocument.setId(lockId); - BridgeInternal.setProperty(containerDocument, com.azure.data.cosmos.internal.Constants.Properties.TTL, Long.valueOf(lockExpirationTime.getSeconds()).intValue()); + BridgeInternal.setProperty(containerDocument, Constants.Properties.TTL, Long.valueOf(lockExpirationTime.getSeconds()).intValue()); return this.client.createItem(this.leaseCollectionLink, containerDocument, null, false) .map(documentResourceResponse -> { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/DocumentServiceLeaseUpdaterImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/DocumentServiceLeaseUpdaterImpl.java similarity index 83% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/DocumentServiceLeaseUpdaterImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/DocumentServiceLeaseUpdaterImpl.java index fda514eaf3d8..09d65e2119ea 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/DocumentServiceLeaseUpdaterImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/DocumentServiceLeaseUpdaterImpl.java @@ -1,14 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncItem; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedContextClient; -import com.azure.data.cosmos.internal.changefeed.Lease; -import com.azure.data.cosmos.internal.changefeed.ServiceItemLease; -import com.azure.data.cosmos.internal.changefeed.ServiceItemLeaseUpdater; -import com.azure.data.cosmos.internal.changefeed.exceptions.LeaseLostException; +import com.azure.cosmos.AccessCondition; +import com.azure.cosmos.AccessConditionType; +import com.azure.cosmos.CosmosAsyncItem; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.internal.changefeed.ChangeFeedContextClient; +import com.azure.cosmos.internal.changefeed.Lease; +import com.azure.cosmos.internal.changefeed.ServiceItemLease; +import com.azure.cosmos.internal.changefeed.ServiceItemLeaseUpdater; +import com.azure.cosmos.internal.changefeed.exceptions.LeaseLostException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; @@ -17,9 +21,9 @@ import java.time.ZonedDateTime; import java.util.function.Function; -import static com.azure.data.cosmos.internal.changefeed.implementation.ChangeFeedHelper.HTTP_STATUS_CODE_CONFLICT; -import static com.azure.data.cosmos.internal.changefeed.implementation.ChangeFeedHelper.HTTP_STATUS_CODE_NOT_FOUND; -import static com.azure.data.cosmos.internal.changefeed.implementation.ChangeFeedHelper.HTTP_STATUS_CODE_PRECONDITION_FAILED; +import static com.azure.cosmos.internal.changefeed.implementation.ChangeFeedHelper.HTTP_STATUS_CODE_CONFLICT; +import static com.azure.cosmos.internal.changefeed.implementation.ChangeFeedHelper.HTTP_STATUS_CODE_NOT_FOUND; +import static com.azure.cosmos.internal.changefeed.implementation.ChangeFeedHelper.HTTP_STATUS_CODE_PRECONDITION_FAILED; /** * Implementation for service lease updater interface. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/EqualPartitionsBalancingStrategy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/EqualPartitionsBalancingStrategy.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/EqualPartitionsBalancingStrategy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/EqualPartitionsBalancingStrategy.java index 302e7f5acc1f..a125b7213cd1 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/EqualPartitionsBalancingStrategy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/EqualPartitionsBalancingStrategy.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.internal.changefeed.Lease; -import com.azure.data.cosmos.internal.changefeed.PartitionLoadBalancingStrategy; +import com.azure.cosmos.internal.changefeed.Lease; +import com.azure.cosmos.internal.changefeed.PartitionLoadBalancingStrategy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ExceptionClassifier.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ExceptionClassifier.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ExceptionClassifier.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ExceptionClassifier.java index bb3050f01d71..270aa9214c54 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ExceptionClassifier.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ExceptionClassifier.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosClientException; /** * Classifies exceptions based on the status codes. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/HealthMonitoringPartitionControllerDecorator.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/HealthMonitoringPartitionControllerDecorator.java similarity index 80% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/HealthMonitoringPartitionControllerDecorator.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/HealthMonitoringPartitionControllerDecorator.java index 185558f97556..de494a25634f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/HealthMonitoringPartitionControllerDecorator.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/HealthMonitoringPartitionControllerDecorator.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.changefeed.HealthMonitor; -import com.azure.data.cosmos.internal.changefeed.HealthMonitoringRecord; -import com.azure.data.cosmos.internal.changefeed.Lease; -import com.azure.data.cosmos.internal.changefeed.PartitionController; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.changefeed.HealthMonitor; +import com.azure.cosmos.internal.changefeed.HealthMonitoringRecord; +import com.azure.cosmos.internal.changefeed.Lease; +import com.azure.cosmos.internal.changefeed.PartitionController; import reactor.core.publisher.Mono; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/LeaseRenewerImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/LeaseRenewerImpl.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/LeaseRenewerImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/LeaseRenewerImpl.java index cf466b109d03..60f512b230c8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/LeaseRenewerImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/LeaseRenewerImpl.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.internal.changefeed.CancellationToken; -import com.azure.data.cosmos.internal.changefeed.Lease; -import com.azure.data.cosmos.internal.changefeed.LeaseManager; -import com.azure.data.cosmos.internal.changefeed.LeaseRenewer; -import com.azure.data.cosmos.internal.changefeed.exceptions.LeaseLostException; +import com.azure.cosmos.internal.changefeed.CancellationToken; +import com.azure.cosmos.internal.changefeed.Lease; +import com.azure.cosmos.internal.changefeed.LeaseManager; +import com.azure.cosmos.internal.changefeed.LeaseRenewer; +import com.azure.cosmos.internal.changefeed.exceptions.LeaseLostException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/LeaseStoreManagerImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/LeaseStoreManagerImpl.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/LeaseStoreManagerImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/LeaseStoreManagerImpl.java index 5208862325ef..2be09cf750aa 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/LeaseStoreManagerImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/LeaseStoreManagerImpl.java @@ -1,24 +1,24 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; - -import com.azure.data.cosmos.CosmosAsyncContainer; -import com.azure.data.cosmos.CosmosAsyncItem; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.CosmosItemProperties; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.SqlParameter; -import com.azure.data.cosmos.SqlParameterList; -import com.azure.data.cosmos.SqlQuerySpec; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedContextClient; -import com.azure.data.cosmos.internal.changefeed.Lease; -import com.azure.data.cosmos.internal.changefeed.LeaseStore; -import com.azure.data.cosmos.internal.changefeed.LeaseStoreManager; -import com.azure.data.cosmos.internal.changefeed.LeaseStoreManagerSettings; -import com.azure.data.cosmos.internal.changefeed.RequestOptionsFactory; -import com.azure.data.cosmos.internal.changefeed.ServiceItemLease; -import com.azure.data.cosmos.internal.changefeed.ServiceItemLeaseUpdater; -import com.azure.data.cosmos.internal.changefeed.exceptions.LeaseLostException; +package com.azure.cosmos.internal.changefeed.implementation; + +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncItem; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.SqlParameter; +import com.azure.cosmos.SqlParameterList; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.changefeed.ChangeFeedContextClient; +import com.azure.cosmos.internal.changefeed.Lease; +import com.azure.cosmos.internal.changefeed.LeaseStore; +import com.azure.cosmos.internal.changefeed.LeaseStoreManager; +import com.azure.cosmos.internal.changefeed.LeaseStoreManagerSettings; +import com.azure.cosmos.internal.changefeed.RequestOptionsFactory; +import com.azure.cosmos.internal.changefeed.ServiceItemLease; +import com.azure.cosmos.internal.changefeed.ServiceItemLeaseUpdater; +import com.azure.cosmos.internal.changefeed.exceptions.LeaseLostException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ObserverExceptionWrappingChangeFeedObserverDecorator.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ObserverExceptionWrappingChangeFeedObserverDecorator.java similarity index 82% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ObserverExceptionWrappingChangeFeedObserverDecorator.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ObserverExceptionWrappingChangeFeedObserverDecorator.java index 301c5230df7d..62f1e66459ae 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/ObserverExceptionWrappingChangeFeedObserverDecorator.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/ObserverExceptionWrappingChangeFeedObserverDecorator.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.CosmosItemProperties; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserver; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserverCloseReason; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserverContext; -import com.azure.data.cosmos.internal.changefeed.exceptions.ObserverException; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserver; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserverCloseReason; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserverContext; +import com.azure.cosmos.internal.changefeed.exceptions.ObserverException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionCheckpointerImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionCheckpointerImpl.java similarity index 81% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionCheckpointerImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionCheckpointerImpl.java index 894f7c17e1d1..e103e943af00 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionCheckpointerImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionCheckpointerImpl.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.internal.changefeed.Lease; -import com.azure.data.cosmos.internal.changefeed.LeaseCheckpointer; -import com.azure.data.cosmos.internal.changefeed.PartitionCheckpointer; +import com.azure.cosmos.internal.changefeed.Lease; +import com.azure.cosmos.internal.changefeed.LeaseCheckpointer; +import com.azure.cosmos.internal.changefeed.PartitionCheckpointer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionControllerImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionControllerImpl.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionControllerImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionControllerImpl.java index 3a3ff5708f26..219533b4f24c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionControllerImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionControllerImpl.java @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; - -import com.azure.data.cosmos.internal.changefeed.CancellationToken; -import com.azure.data.cosmos.internal.changefeed.CancellationTokenSource; -import com.azure.data.cosmos.internal.changefeed.Lease; -import com.azure.data.cosmos.internal.changefeed.LeaseContainer; -import com.azure.data.cosmos.internal.changefeed.LeaseManager; -import com.azure.data.cosmos.internal.changefeed.PartitionController; -import com.azure.data.cosmos.internal.changefeed.PartitionSupervisor; -import com.azure.data.cosmos.internal.changefeed.PartitionSupervisorFactory; -import com.azure.data.cosmos.internal.changefeed.PartitionSynchronizer; -import com.azure.data.cosmos.internal.changefeed.exceptions.PartitionSplitException; -import com.azure.data.cosmos.internal.changefeed.exceptions.TaskCancelledException; +package com.azure.cosmos.internal.changefeed.implementation; + +import com.azure.cosmos.internal.changefeed.CancellationToken; +import com.azure.cosmos.internal.changefeed.CancellationTokenSource; +import com.azure.cosmos.internal.changefeed.Lease; +import com.azure.cosmos.internal.changefeed.LeaseContainer; +import com.azure.cosmos.internal.changefeed.LeaseManager; +import com.azure.cosmos.internal.changefeed.PartitionController; +import com.azure.cosmos.internal.changefeed.PartitionSupervisor; +import com.azure.cosmos.internal.changefeed.PartitionSupervisorFactory; +import com.azure.cosmos.internal.changefeed.PartitionSynchronizer; +import com.azure.cosmos.internal.changefeed.exceptions.PartitionSplitException; +import com.azure.cosmos.internal.changefeed.exceptions.TaskCancelledException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionLoadBalancerImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionLoadBalancerImpl.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionLoadBalancerImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionLoadBalancerImpl.java index 9e6d93fce388..a9c40c37331f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionLoadBalancerImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionLoadBalancerImpl.java @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; - -import com.azure.data.cosmos.internal.changefeed.CancellationToken; -import com.azure.data.cosmos.internal.changefeed.CancellationTokenSource; -import com.azure.data.cosmos.internal.changefeed.Lease; -import com.azure.data.cosmos.internal.changefeed.LeaseContainer; -import com.azure.data.cosmos.internal.changefeed.PartitionController; -import com.azure.data.cosmos.internal.changefeed.PartitionLoadBalancer; -import com.azure.data.cosmos.internal.changefeed.PartitionLoadBalancingStrategy; +package com.azure.cosmos.internal.changefeed.implementation; + +import com.azure.cosmos.internal.changefeed.CancellationToken; +import com.azure.cosmos.internal.changefeed.CancellationTokenSource; +import com.azure.cosmos.internal.changefeed.Lease; +import com.azure.cosmos.internal.changefeed.LeaseContainer; +import com.azure.cosmos.internal.changefeed.PartitionController; +import com.azure.cosmos.internal.changefeed.PartitionLoadBalancer; +import com.azure.cosmos.internal.changefeed.PartitionLoadBalancingStrategy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionManagerImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionManagerImpl.java similarity index 77% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionManagerImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionManagerImpl.java index 8c30c0274e10..43a26ef334b9 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionManagerImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionManagerImpl.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.internal.changefeed.Bootstrapper; -import com.azure.data.cosmos.internal.changefeed.PartitionController; -import com.azure.data.cosmos.internal.changefeed.PartitionLoadBalancer; -import com.azure.data.cosmos.internal.changefeed.PartitionManager; +import com.azure.cosmos.internal.changefeed.Bootstrapper; +import com.azure.cosmos.internal.changefeed.PartitionController; +import com.azure.cosmos.internal.changefeed.PartitionLoadBalancer; +import com.azure.cosmos.internal.changefeed.PartitionManager; import reactor.core.publisher.Mono; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionProcessorFactoryImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionProcessorFactoryImpl.java similarity index 79% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionProcessorFactoryImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionProcessorFactoryImpl.java index 227dd127b905..b365c22a1c2f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionProcessorFactoryImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionProcessorFactoryImpl.java @@ -1,17 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.ChangeFeedProcessorOptions; -import com.azure.data.cosmos.CosmosAsyncContainer; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedContextClient; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserver; -import com.azure.data.cosmos.internal.changefeed.Lease; -import com.azure.data.cosmos.internal.changefeed.LeaseCheckpointer; -import com.azure.data.cosmos.internal.changefeed.PartitionCheckpointer; -import com.azure.data.cosmos.internal.changefeed.PartitionProcessor; -import com.azure.data.cosmos.internal.changefeed.PartitionProcessorFactory; -import com.azure.data.cosmos.internal.changefeed.ProcessorSettings; +import com.azure.cosmos.ChangeFeedProcessorOptions; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.internal.changefeed.ChangeFeedContextClient; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserver; +import com.azure.cosmos.internal.changefeed.Lease; +import com.azure.cosmos.internal.changefeed.LeaseCheckpointer; +import com.azure.cosmos.internal.changefeed.PartitionCheckpointer; +import com.azure.cosmos.internal.changefeed.PartitionProcessor; +import com.azure.cosmos.internal.changefeed.PartitionProcessorFactory; +import com.azure.cosmos.internal.changefeed.ProcessorSettings; /** * Implementation for {@link PartitionProcessorFactory}. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionProcessorImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionProcessorImpl.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionProcessorImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionProcessorImpl.java index 15c5be30c3f2..e2f204ef93ea 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionProcessorImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionProcessorImpl.java @@ -1,21 +1,21 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; - -import com.azure.data.cosmos.ChangeFeedOptions; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.CosmosItemProperties; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.internal.changefeed.CancellationToken; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedContextClient; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserver; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserverContext; -import com.azure.data.cosmos.internal.changefeed.PartitionCheckpointer; -import com.azure.data.cosmos.internal.changefeed.PartitionProcessor; -import com.azure.data.cosmos.internal.changefeed.ProcessorSettings; -import com.azure.data.cosmos.internal.changefeed.exceptions.PartitionNotFoundException; -import com.azure.data.cosmos.internal.changefeed.exceptions.PartitionSplitException; -import com.azure.data.cosmos.internal.changefeed.exceptions.TaskCancelledException; +package com.azure.cosmos.internal.changefeed.implementation; + +import com.azure.cosmos.ChangeFeedOptions; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.changefeed.CancellationToken; +import com.azure.cosmos.internal.changefeed.ChangeFeedContextClient; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserver; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserverContext; +import com.azure.cosmos.internal.changefeed.PartitionCheckpointer; +import com.azure.cosmos.internal.changefeed.PartitionProcessor; +import com.azure.cosmos.internal.changefeed.ProcessorSettings; +import com.azure.cosmos.internal.changefeed.exceptions.PartitionNotFoundException; +import com.azure.cosmos.internal.changefeed.exceptions.PartitionSplitException; +import com.azure.cosmos.internal.changefeed.exceptions.TaskCancelledException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Flux; @@ -24,7 +24,7 @@ import java.time.Duration; import java.time.ZonedDateTime; -import static com.azure.data.cosmos.CommonsBridgeInternal.partitionKeyRangeIdInternal; +import static com.azure.cosmos.CommonsBridgeInternal.partitionKeyRangeIdInternal; import static java.time.temporal.ChronoUnit.MILLIS; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionSupervisorFactoryImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionSupervisorFactoryImpl.java similarity index 74% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionSupervisorFactoryImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionSupervisorFactoryImpl.java index 3dc70e536361..59759cce241b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionSupervisorFactoryImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionSupervisorFactoryImpl.java @@ -1,17 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.ChangeFeedProcessorOptions; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserver; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserverFactory; -import com.azure.data.cosmos.internal.changefeed.Lease; -import com.azure.data.cosmos.internal.changefeed.LeaseManager; -import com.azure.data.cosmos.internal.changefeed.LeaseRenewer; -import com.azure.data.cosmos.internal.changefeed.PartitionProcessor; -import com.azure.data.cosmos.internal.changefeed.PartitionProcessorFactory; -import com.azure.data.cosmos.internal.changefeed.PartitionSupervisor; -import com.azure.data.cosmos.internal.changefeed.PartitionSupervisorFactory; +import com.azure.cosmos.ChangeFeedProcessorOptions; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserver; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserverFactory; +import com.azure.cosmos.internal.changefeed.Lease; +import com.azure.cosmos.internal.changefeed.LeaseManager; +import com.azure.cosmos.internal.changefeed.LeaseRenewer; +import com.azure.cosmos.internal.changefeed.PartitionProcessor; +import com.azure.cosmos.internal.changefeed.PartitionProcessorFactory; +import com.azure.cosmos.internal.changefeed.PartitionSupervisor; +import com.azure.cosmos.internal.changefeed.PartitionSupervisorFactory; import reactor.core.scheduler.Scheduler; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionSupervisorImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionSupervisorImpl.java similarity index 80% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionSupervisorImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionSupervisorImpl.java index 3bbf420c16df..58e11a8c9bd1 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionSupervisorImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionSupervisorImpl.java @@ -1,20 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; - -import com.azure.data.cosmos.internal.changefeed.CancellationToken; -import com.azure.data.cosmos.internal.changefeed.CancellationTokenSource; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserver; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserverCloseReason; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedObserverContext; -import com.azure.data.cosmos.internal.changefeed.Lease; -import com.azure.data.cosmos.internal.changefeed.LeaseRenewer; -import com.azure.data.cosmos.internal.changefeed.PartitionProcessor; -import com.azure.data.cosmos.internal.changefeed.PartitionSupervisor; -import com.azure.data.cosmos.internal.changefeed.exceptions.LeaseLostException; -import com.azure.data.cosmos.internal.changefeed.exceptions.ObserverException; -import com.azure.data.cosmos.internal.changefeed.exceptions.PartitionSplitException; -import com.azure.data.cosmos.internal.changefeed.exceptions.TaskCancelledException; +package com.azure.cosmos.internal.changefeed.implementation; + +import com.azure.cosmos.internal.changefeed.CancellationToken; +import com.azure.cosmos.internal.changefeed.CancellationTokenSource; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserver; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserverCloseReason; +import com.azure.cosmos.internal.changefeed.ChangeFeedObserverContext; +import com.azure.cosmos.internal.changefeed.Lease; +import com.azure.cosmos.internal.changefeed.LeaseRenewer; +import com.azure.cosmos.internal.changefeed.PartitionProcessor; +import com.azure.cosmos.internal.changefeed.PartitionSupervisor; +import com.azure.cosmos.internal.changefeed.exceptions.LeaseLostException; +import com.azure.cosmos.internal.changefeed.exceptions.ObserverException; +import com.azure.cosmos.internal.changefeed.exceptions.PartitionSplitException; +import com.azure.cosmos.internal.changefeed.exceptions.TaskCancelledException; import reactor.core.publisher.Mono; import reactor.core.scheduler.Scheduler; import reactor.core.scheduler.Schedulers; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionSynchronizerImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionSynchronizerImpl.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionSynchronizerImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionSynchronizerImpl.java index da3f9aea967e..10cb522571ba 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionSynchronizerImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionSynchronizerImpl.java @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; - -import com.azure.data.cosmos.CosmosAsyncContainer; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedContextClient; -import com.azure.data.cosmos.internal.changefeed.Lease; -import com.azure.data.cosmos.internal.changefeed.LeaseContainer; -import com.azure.data.cosmos.internal.changefeed.LeaseManager; -import com.azure.data.cosmos.internal.changefeed.PartitionSynchronizer; +package com.azure.cosmos.internal.changefeed.implementation; + +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.changefeed.ChangeFeedContextClient; +import com.azure.cosmos.internal.changefeed.Lease; +import com.azure.cosmos.internal.changefeed.LeaseContainer; +import com.azure.cosmos.internal.changefeed.LeaseManager; +import com.azure.cosmos.internal.changefeed.PartitionSynchronizer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Flux; @@ -18,7 +18,7 @@ import java.util.HashSet; import java.util.Set; -import static com.azure.data.cosmos.BridgeInternal.extractContainerSelfLink; +import static com.azure.cosmos.BridgeInternal.extractContainerSelfLink; /** * Implementation for the partition synchronizer. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionedByIdCollectionRequestOptionsFactory.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionedByIdCollectionRequestOptionsFactory.java similarity index 70% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionedByIdCollectionRequestOptionsFactory.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionedByIdCollectionRequestOptionsFactory.java index b1f749913d8b..46a58dbc69f2 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/PartitionedByIdCollectionRequestOptionsFactory.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/PartitionedByIdCollectionRequestOptionsFactory.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.CosmosItemRequestOptions; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.internal.changefeed.Lease; -import com.azure.data.cosmos.internal.changefeed.RequestOptionsFactory; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.internal.changefeed.Lease; +import com.azure.cosmos.internal.changefeed.RequestOptionsFactory; /** * Used to create request setOptions for partitioned lease collections, when partition getKey is defined as /getId. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/RemainingPartitionWorkImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/RemainingPartitionWorkImpl.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/RemainingPartitionWorkImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/RemainingPartitionWorkImpl.java index 5e1da46ec0ea..0979f34c5cb3 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/RemainingPartitionWorkImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/RemainingPartitionWorkImpl.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.internal.changefeed.RemainingPartitionWork; +import com.azure.cosmos.internal.changefeed.RemainingPartitionWork; /** * Implements the {@link RemainingPartitionWork} interface. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/RemainingWorkEstimatorImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/RemainingWorkEstimatorImpl.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/RemainingWorkEstimatorImpl.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/RemainingWorkEstimatorImpl.java index fd2511242a9c..7438e1fb11e0 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/RemainingWorkEstimatorImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/RemainingWorkEstimatorImpl.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.internal.changefeed.ChangeFeedContextClient; -import com.azure.data.cosmos.internal.changefeed.LeaseContainer; -import com.azure.data.cosmos.internal.changefeed.RemainingPartitionWork; -import com.azure.data.cosmos.internal.changefeed.RemainingWorkEstimator; +import com.azure.cosmos.internal.changefeed.ChangeFeedContextClient; +import com.azure.cosmos.internal.changefeed.LeaseContainer; +import com.azure.cosmos.internal.changefeed.RemainingPartitionWork; +import com.azure.cosmos.internal.changefeed.RemainingWorkEstimator; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/StatusCodeErrorType.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/StatusCodeErrorType.java similarity index 83% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/StatusCodeErrorType.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/StatusCodeErrorType.java index f2abb4082826..1d39fa1ce37b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/StatusCodeErrorType.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/StatusCodeErrorType.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; /** * Groups types of status code errors returned while processing the change feeds. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/TraceHealthMonitor.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/TraceHealthMonitor.java similarity index 79% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/TraceHealthMonitor.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/TraceHealthMonitor.java index e4be68a9bd05..cdb51f49c64d 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/TraceHealthMonitor.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/TraceHealthMonitor.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.internal.changefeed.HealthMonitor; -import com.azure.data.cosmos.internal.changefeed.HealthMonitoringRecord; +import com.azure.cosmos.internal.changefeed.HealthMonitor; +import com.azure.cosmos.internal.changefeed.HealthMonitoringRecord; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/WorkerTask.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/WorkerTask.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/WorkerTask.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/WorkerTask.java index b5441b303bca..201a37338585 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/changefeed/implementation/WorkerTask.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/changefeed/implementation/WorkerTask.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.changefeed.implementation; +package com.azure.cosmos.internal.changefeed.implementation; -import com.azure.data.cosmos.internal.changefeed.Lease; +import com.azure.cosmos.internal.changefeed.Lease; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/Address.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/Address.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/Address.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/Address.java index b1a3c4311455..55ce39f40c66 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/Address.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/Address.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.Constants; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.Constants; /** * Used internally to represent a physical address in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/AddressInformation.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/AddressInformation.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/AddressInformation.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/AddressInformation.java index 840dff9eab09..5e7c0a61f5e8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/AddressInformation.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/AddressInformation.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; import java.util.Objects; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/AddressResolver.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/AddressResolver.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/AddressResolver.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/AddressResolver.java index b08072ee08d3..89d286c8212d 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/AddressResolver.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/AddressResolver.java @@ -1,30 +1,30 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.BadRequestException; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.InternalServerErrorException; -import com.azure.data.cosmos.InvalidPartitionException; -import com.azure.data.cosmos.NotFoundException; -import com.azure.data.cosmos.PartitionKeyRangeGoneException; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.ICollectionRoutingMapCache; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.ResourceId; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.caches.RxCollectionCache; -import com.azure.data.cosmos.internal.routing.CollectionRoutingMap; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternal; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternalHelper; -import com.azure.data.cosmos.internal.routing.PartitionKeyRangeIdentity; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BadRequestException; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.InternalServerErrorException; +import com.azure.cosmos.InvalidPartitionException; +import com.azure.cosmos.NotFoundException; +import com.azure.cosmos.PartitionKeyRangeGoneException; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.ICollectionRoutingMapCache; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.ResourceId; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.caches.RxCollectionCache; +import com.azure.cosmos.internal.routing.CollectionRoutingMap; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.routing.PartitionKeyInternalHelper; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/AddressSelector.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/AddressSelector.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/AddressSelector.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/AddressSelector.java index dbbbbf1cd237..81674bfd3e70 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/AddressSelector.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/AddressSelector.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.Strings; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Strings; import reactor.core.publisher.Mono; import java.net.URI; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/BarrierRequestHelper.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/BarrierRequestHelper.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/BarrierRequestHelper.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/BarrierRequestHelper.java index cea84641e2b9..dd67ce6c4f42 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/BarrierRequestHelper.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/BarrierRequestHelper.java @@ -1,20 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.InternalServerErrorException; -import com.azure.data.cosmos.internal.AuthorizationTokenType; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.PathsHelper; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.ResourceId; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.Utils; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.InternalServerErrorException; +import com.azure.cosmos.internal.AuthorizationTokenType; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.PathsHelper; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.ResourceId; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.Exceptions; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ConsistencyReader.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ConsistencyReader.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ConsistencyReader.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ConsistencyReader.java index 818f42e6c168..e77759ef4908 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ConsistencyReader.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ConsistencyReader.java @@ -1,22 +1,22 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.internal.ISessionContainer; -import com.azure.data.cosmos.NotFoundException; -import com.azure.data.cosmos.RequestTimeoutException; -import com.azure.data.cosmos.internal.Configs; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.ISessionToken; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.RequestChargeTracker; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.internal.ISessionContainer; +import com.azure.cosmos.NotFoundException; +import com.azure.cosmos.RequestTimeoutException; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.ISessionToken; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.RequestChargeTracker; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.List; -import static com.azure.data.cosmos.internal.Utils.ValueHolder; +import static com.azure.cosmos.internal.Utils.ValueHolder; /* ConsistencyLevel Replication Mode Desired ReadMode diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ConsistencyWriter.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ConsistencyWriter.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ConsistencyWriter.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ConsistencyWriter.java index 17cc4ab57b57..270566f49203 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ConsistencyWriter.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ConsistencyWriter.java @@ -1,23 +1,23 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.internal.ISessionContainer; -import com.azure.data.cosmos.RequestTimeoutException; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.Integers; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.RequestChargeTracker; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.SessionTokenHelper; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.Utils; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.internal.ISessionContainer; +import com.azure.cosmos.RequestTimeoutException; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.Integers; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.RequestChargeTracker; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.SessionTokenHelper; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.Utils; import org.apache.commons.collections4.ComparatorUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/CustomHeaders.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/CustomHeaders.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/CustomHeaders.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/CustomHeaders.java index 49d0d993bedf..3cfea54206b6 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/CustomHeaders.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/CustomHeaders.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; public final class CustomHeaders { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ErrorUtils.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ErrorUtils.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ErrorUtils.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ErrorUtils.java index 230e28463c69..def8efe43fb7 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ErrorUtils.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ErrorUtils.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.http.HttpRequest; -import com.azure.data.cosmos.internal.http.HttpResponse; +import com.azure.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.internal.http.HttpResponse; import io.netty.handler.codec.http.HttpMethod; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/GatewayAddressCache.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/GatewayAddressCache.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/GatewayAddressCache.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/GatewayAddressCache.java index 784dea6bca42..2639ce723979 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/GatewayAddressCache.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/GatewayAddressCache.java @@ -1,34 +1,34 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.PartitionKeyRangeGoneException; -import com.azure.data.cosmos.internal.AuthorizationTokenType; -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.Exceptions; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.JavaStreamUtils; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.Paths; -import com.azure.data.cosmos.internal.PathsHelper; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.RxDocumentServiceResponse; -import com.azure.data.cosmos.internal.UserAgentContainer; -import com.azure.data.cosmos.internal.Utils; -import com.azure.data.cosmos.internal.caches.AsyncCache; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.http.HttpHeaders; -import com.azure.data.cosmos.internal.http.HttpRequest; -import com.azure.data.cosmos.internal.http.HttpResponse; -import com.azure.data.cosmos.internal.routing.PartitionKeyRangeIdentity; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.PartitionKeyRangeGoneException; +import com.azure.cosmos.internal.AuthorizationTokenType; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Exceptions; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.JavaStreamUtils; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.PathsHelper; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.RxDocumentServiceResponse; +import com.azure.cosmos.internal.UserAgentContainer; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.caches.AsyncCache; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.internal.http.HttpResponse; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; import io.netty.handler.codec.http.HttpMethod; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; @@ -138,8 +138,8 @@ public Mono tryGetAddresses(RxDocumentServiceRequest reque PartitionKeyRangeIdentity partitionKeyRangeIdentity, boolean forceRefreshPartitionAddresses) { - com.azure.data.cosmos.internal.Utils.checkNotNullOrThrow(request, "request", ""); - com.azure.data.cosmos.internal.Utils.checkNotNullOrThrow(partitionKeyRangeIdentity, "partitionKeyRangeIdentity", ""); + Utils.checkNotNullOrThrow(request, "request", ""); + Utils.checkNotNullOrThrow(partitionKeyRangeIdentity, "partitionKeyRangeIdentity", ""); logger.debug("PartitionKeyRangeIdentity {}, forceRefreshPartitionAddresses {}", partitionKeyRangeIdentity, @@ -216,7 +216,7 @@ public Mono tryGetAddresses(RxDocumentServiceRequest reque return addresses; }).onErrorResume(ex -> { Throwable unwrappedException = reactor.core.Exceptions.unwrap(ex); - CosmosClientException dce = com.azure.data.cosmos.internal.Utils.as(unwrappedException, CosmosClientException.class); + CosmosClientException dce = Utils.as(unwrappedException, CosmosClientException.class); if (dce == null) { logger.error("unexpected failure", ex); if (forceRefreshPartitionAddressesModified) { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/GatewayServiceConfigurationReader.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/GatewayServiceConfigurationReader.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/GatewayServiceConfigurationReader.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/GatewayServiceConfigurationReader.java index 656f58a9f302..709a20ae8cb6 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/GatewayServiceConfigurationReader.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/GatewayServiceConfigurationReader.java @@ -1,23 +1,23 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.internal.BaseAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.DatabaseAccount; -import com.azure.data.cosmos.internal.GlobalEndpointManager; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.ReplicationPolicy; -import com.azure.data.cosmos.internal.UserAgentContainer; -import com.azure.data.cosmos.internal.Utils; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.http.HttpHeaders; -import com.azure.data.cosmos.internal.http.HttpRequest; -import com.azure.data.cosmos.internal.http.HttpResponse; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.internal.BaseAuthorizationTokenProvider; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.DatabaseAccount; +import com.azure.cosmos.internal.GlobalEndpointManager; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.ReplicationPolicy; +import com.azure.cosmos.internal.UserAgentContainer; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.internal.http.HttpResponse; import io.netty.handler.codec.http.HttpMethod; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/GlobalAddressResolver.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/GlobalAddressResolver.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/GlobalAddressResolver.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/GlobalAddressResolver.java index 4c8d1e33e823..325203ed221c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/GlobalAddressResolver.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/GlobalAddressResolver.java @@ -1,21 +1,21 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - - -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.internal.GlobalEndpointManager; -import com.azure.data.cosmos.internal.IAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.UserAgentContainer; -import com.azure.data.cosmos.internal.caches.RxCollectionCache; -import com.azure.data.cosmos.internal.caches.RxPartitionKeyRangeCache; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.routing.CollectionRoutingMap; -import com.azure.data.cosmos.internal.routing.PartitionKeyRangeIdentity; +package com.azure.cosmos.internal.directconnectivity; + + +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.GlobalEndpointManager; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.UserAgentContainer; +import com.azure.cosmos.internal.caches.RxCollectionCache; +import com.azure.cosmos.internal.caches.RxPartitionKeyRangeCache; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.routing.CollectionRoutingMap; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; import reactor.core.publisher.Mono; import java.net.URL; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/GoneAndRetryWithRetryPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/GoneAndRetryWithRetryPolicy.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/GoneAndRetryWithRetryPolicy.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/GoneAndRetryWithRetryPolicy.java index acbaa259b13b..195f1df75d89 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/GoneAndRetryWithRetryPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/GoneAndRetryWithRetryPolicy.java @@ -1,20 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.InvalidPartitionException; -import com.azure.data.cosmos.PartitionIsMigratingException; -import com.azure.data.cosmos.PartitionKeyRangeGoneException; -import com.azure.data.cosmos.PartitionKeyRangeIsSplittingException; -import com.azure.data.cosmos.RetryWithException; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IRetryPolicy; -import com.azure.data.cosmos.internal.Quadruple; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.InvalidPartitionException; +import com.azure.cosmos.PartitionIsMigratingException; +import com.azure.cosmos.PartitionKeyRangeGoneException; +import com.azure.cosmos.PartitionKeyRangeIsSplittingException; +import com.azure.cosmos.RetryWithException; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IRetryPolicy; +import com.azure.cosmos.internal.Quadruple; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import org.apache.commons.lang3.time.StopWatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/HttpClientUtils.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/HttpClientUtils.java similarity index 77% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/HttpClientUtils.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/HttpClientUtils.java index 48d9f571890e..6f07eb88cca0 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/HttpClientUtils.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/HttpClientUtils.java @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.CosmosError; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RxDocumentServiceResponse; -import com.azure.data.cosmos.internal.http.HttpRequest; -import com.azure.data.cosmos.internal.http.HttpResponse; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosError; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RxDocumentServiceResponse; +import com.azure.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.internal.http.HttpResponse; import reactor.core.publisher.Mono; public class HttpClientUtils { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/HttpTransportClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/HttpTransportClient.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/HttpTransportClient.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/HttpTransportClient.java index 7b157c0bc886..3a13f3903eed 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/HttpTransportClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/HttpTransportClient.java @@ -1,49 +1,49 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.BadRequestException; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConflictException; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.ForbiddenException; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.InternalServerErrorException; -import com.azure.data.cosmos.InvalidPartitionException; -import com.azure.data.cosmos.LockedException; -import com.azure.data.cosmos.MethodNotAllowedException; -import com.azure.data.cosmos.NotFoundException; -import com.azure.data.cosmos.PartitionIsMigratingException; -import com.azure.data.cosmos.PartitionKeyRangeGoneException; -import com.azure.data.cosmos.PartitionKeyRangeIsSplittingException; -import com.azure.data.cosmos.PreconditionFailedException; -import com.azure.data.cosmos.RequestEntityTooLargeException; -import com.azure.data.cosmos.RequestRateTooLargeException; -import com.azure.data.cosmos.RequestTimeoutException; -import com.azure.data.cosmos.RetryWithException; -import com.azure.data.cosmos.ServiceUnavailableException; -import com.azure.data.cosmos.UnauthorizedException; -import com.azure.data.cosmos.internal.Configs; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.Integers; -import com.azure.data.cosmos.internal.Lists; -import com.azure.data.cosmos.internal.Longs; -import com.azure.data.cosmos.internal.MutableVolatile; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.PathsHelper; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RuntimeConstants; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.UserAgentContainer; -import com.azure.data.cosmos.internal.Utils; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.http.HttpClientConfig; -import com.azure.data.cosmos.internal.http.HttpHeaders; -import com.azure.data.cosmos.internal.http.HttpRequest; -import com.azure.data.cosmos.internal.http.HttpResponse; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BadRequestException; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConflictException; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.ForbiddenException; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.InternalServerErrorException; +import com.azure.cosmos.InvalidPartitionException; +import com.azure.cosmos.LockedException; +import com.azure.cosmos.MethodNotAllowedException; +import com.azure.cosmos.NotFoundException; +import com.azure.cosmos.PartitionIsMigratingException; +import com.azure.cosmos.PartitionKeyRangeGoneException; +import com.azure.cosmos.PartitionKeyRangeIsSplittingException; +import com.azure.cosmos.PreconditionFailedException; +import com.azure.cosmos.RequestEntityTooLargeException; +import com.azure.cosmos.RequestRateTooLargeException; +import com.azure.cosmos.RequestTimeoutException; +import com.azure.cosmos.RetryWithException; +import com.azure.cosmos.ServiceUnavailableException; +import com.azure.cosmos.UnauthorizedException; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.Integers; +import com.azure.cosmos.internal.Lists; +import com.azure.cosmos.internal.Longs; +import com.azure.cosmos.internal.MutableVolatile; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.PathsHelper; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RuntimeConstants; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.UserAgentContainer; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpClientConfig; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.internal.http.HttpResponse; import io.netty.handler.codec.http.HttpMethod; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -57,7 +57,7 @@ import java.util.Map; import java.util.UUID; -import static com.azure.data.cosmos.internal.Utils.trimBeginningAndEndingSlashes; +import static com.azure.cosmos.internal.Utils.trimBeginningAndEndingSlashes; /* * The following code only support Document Write without any error handling support. */ diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/HttpUtils.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/HttpUtils.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/HttpUtils.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/HttpUtils.java index e8132b0f96bd..777224b36d5b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/HttpUtils.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/HttpUtils.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.Constants.UrlEncodingInfo; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.Constants.UrlEncodingInfo; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.http.HttpHeaders; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/IAddressCache.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/IAddressCache.java similarity index 83% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/IAddressCache.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/IAddressCache.java index 94ee28b5b45e..98731e348357 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/IAddressCache.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/IAddressCache.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.routing.PartitionKeyRangeIdentity; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; import reactor.core.publisher.Mono; public interface IAddressCache { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/IAddressResolver.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/IAddressResolver.java similarity index 72% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/IAddressResolver.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/IAddressResolver.java index c52c8d54ddbe..36944cc33fde 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/IAddressResolver.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/IAddressResolver.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import reactor.core.publisher.Mono; public interface IAddressResolver { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/IStoreClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/IStoreClient.java similarity index 82% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/IStoreClient.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/IStoreClient.java index 7047dc786e62..c9aa532db0a5 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/IStoreClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/IStoreClient.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.IRetryPolicy; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.RxDocumentServiceResponse; +import com.azure.cosmos.internal.IRetryPolicy; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.RxDocumentServiceResponse; import reactor.core.publisher.Mono; import java.util.function.Function; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/Protocol.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/Protocol.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/Protocol.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/Protocol.java index 077528098b45..02bea0fe4b1f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/Protocol.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/Protocol.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; import org.apache.commons.text.WordUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/QueryRequestPerformanceActivity.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/QueryRequestPerformanceActivity.java similarity index 80% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/QueryRequestPerformanceActivity.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/QueryRequestPerformanceActivity.java index 2ad7a31e80e2..c62d34cdc430 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/QueryRequestPerformanceActivity.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/QueryRequestPerformanceActivity.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; // TODO troubleshooting info // https://msdata.visualstudio.com/CosmosDB/_workitems/edit/258624 diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/QuorumReader.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/QuorumReader.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/QuorumReader.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/QuorumReader.java index f1eb73556d0f..aeb2ee4eaaea 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/QuorumReader.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/QuorumReader.java @@ -1,21 +1,21 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - - -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.InternalServerErrorException; -import com.azure.data.cosmos.internal.Configs; -import com.azure.data.cosmos.internal.IAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.JavaStreamUtils; -import com.azure.data.cosmos.internal.MutableVolatile; -import com.azure.data.cosmos.internal.Quadruple; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.RequestChargeTracker; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; +package com.azure.cosmos.internal.directconnectivity; + + +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.InternalServerErrorException; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.JavaStreamUtils; +import com.azure.cosmos.internal.MutableVolatile; +import com.azure.cosmos.internal.Quadruple; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.RequestChargeTracker; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import org.apache.commons.lang3.tuple.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; -import static com.azure.data.cosmos.internal.Utils.ValueHolder; +import static com.azure.cosmos.internal.Utils.ValueHolder; // //================================================================================================================= diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ReadMode.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ReadMode.java similarity index 76% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ReadMode.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ReadMode.java index db4b50b4a0ee..891742152763 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ReadMode.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ReadMode.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; public enum ReadMode { Primary, // Test hook diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ReplicatedResourceClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ReplicatedResourceClient.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ReplicatedResourceClient.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ReplicatedResourceClient.java index b12f2a052395..aa7ec2c1f469 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ReplicatedResourceClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ReplicatedResourceClient.java @@ -1,20 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.internal.ISessionContainer; -import com.azure.data.cosmos.internal.BackoffRetryUtility; -import com.azure.data.cosmos.internal.Configs; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.Quadruple; -import com.azure.data.cosmos.internal.ReplicatedResourceClientUtils; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.internal.ISessionContainer; +import com.azure.cosmos.internal.BackoffRetryUtility; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.Quadruple; +import com.azure.cosmos.internal.ReplicatedResourceClientUtils; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/RequestHelper.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/RequestHelper.java similarity index 76% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/RequestHelper.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/RequestHelper.java index 5a809e18ab48..ba058e0f9267 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/RequestHelper.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/RequestHelper.java @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.BadRequestException; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.Strings; +import com.azure.cosmos.BadRequestException; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Strings; import org.apache.commons.lang3.EnumUtils; public class RequestHelper { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ResourceOperation.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ResourceOperation.java similarity index 71% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ResourceOperation.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ResourceOperation.java index b02eb1af3524..c70fd137847e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ResourceOperation.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ResourceOperation.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.ResourceType; public class ResourceOperation { public final OperationType operationType; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ResponseUtils.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ResponseUtils.java similarity index 83% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ResponseUtils.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ResponseUtils.java index e1bdf9f3b3f5..9315b340b404 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ResponseUtils.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ResponseUtils.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.http.HttpHeaders; -import com.azure.data.cosmos.internal.http.HttpRequest; -import com.azure.data.cosmos.internal.http.HttpResponse; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.internal.http.HttpResponse; import io.netty.handler.codec.http.HttpMethod; import org.apache.commons.lang3.StringUtils; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/RntbdTransportClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/RntbdTransportClient.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/RntbdTransportClient.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/RntbdTransportClient.java index 52007f9e426e..b5ceb775e219 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/RntbdTransportClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/RntbdTransportClient.java @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.internal.Configs; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.UserAgentContainer; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdEndpoint; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdObjectMapper; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdRequestArgs; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdRequestRecord; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdServiceEndpoint; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdEndpoint; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdObjectMapper; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdRequestArgs; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdRequestRecord; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdServiceEndpoint; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.UserAgentContainer; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ServerProperties.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ServerProperties.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ServerProperties.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ServerProperties.java index 6a6da6ad003e..7c1d25764b1e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ServerProperties.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ServerProperties.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; final public class ServerProperties { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ServerStoreModel.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ServerStoreModel.java similarity index 78% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ServerStoreModel.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ServerStoreModel.java index ad455343023d..71496c0905a3 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ServerStoreModel.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ServerStoreModel.java @@ -1,17 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.BadRequestException; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.RxDocumentServiceResponse; -import com.azure.data.cosmos.internal.RxStoreModel; -import com.azure.data.cosmos.internal.Strings; +import com.azure.cosmos.BadRequestException; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.RxDocumentServiceResponse; +import com.azure.cosmos.internal.RxStoreModel; +import com.azure.cosmos.internal.Strings; import org.apache.commons.lang3.EnumUtils; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ServiceConfig.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ServiceConfig.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ServiceConfig.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ServiceConfig.java index a3d54c5c85c3..812333c4584d 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ServiceConfig.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/ServiceConfig.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; class ServiceConfig { final static ServiceConfig instance = new ServiceConfig(); diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/StoreClient.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreClient.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/StoreClient.java index 4eef25dc31af..371b2131076b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/StoreClient.java @@ -1,28 +1,28 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.InternalServerErrorException; -import com.azure.data.cosmos.internal.BackoffRetryUtility; -import com.azure.data.cosmos.internal.Configs; -import com.azure.data.cosmos.internal.Exceptions; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.IRetryPolicy; -import com.azure.data.cosmos.internal.ISessionToken; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.RxDocumentServiceResponse; -import com.azure.data.cosmos.internal.SessionContainer; -import com.azure.data.cosmos.internal.SessionTokenHelper; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.Utils; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.InternalServerErrorException; +import com.azure.cosmos.internal.BackoffRetryUtility; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.Exceptions; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.IRetryPolicy; +import com.azure.cosmos.internal.ISessionToken; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.RxDocumentServiceResponse; +import com.azure.cosmos.internal.SessionContainer; +import com.azure.cosmos.internal.SessionTokenHelper; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.Utils; import org.apache.commons.lang3.math.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreClientFactory.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/StoreClientFactory.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreClientFactory.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/StoreClientFactory.java index dddad8cf95d5..04a56b0430df 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreClientFactory.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/StoreClientFactory.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.Configs; -import com.azure.data.cosmos.internal.IAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.SessionContainer; -import com.azure.data.cosmos.internal.UserAgentContainer; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.SessionContainer; +import com.azure.cosmos.internal.UserAgentContainer; // TODO: DANOBLE: no support for ICommunicationEventSource ask Ji // Links: diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreReader.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/StoreReader.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreReader.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/StoreReader.java index 54a02b1cf5ef..1d2fcba55bc2 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreReader.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/StoreReader.java @@ -1,27 +1,27 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.BadRequestException; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.internal.ISessionContainer; -import com.azure.data.cosmos.InternalServerErrorException; -import com.azure.data.cosmos.PartitionIsMigratingException; -import com.azure.data.cosmos.PartitionKeyRangeGoneException; -import com.azure.data.cosmos.PartitionKeyRangeIsSplittingException; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.ISessionToken; -import com.azure.data.cosmos.internal.Integers; -import com.azure.data.cosmos.internal.MutableVolatile; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.SessionTokenHelper; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.Utils; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BadRequestException; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.internal.ISessionContainer; +import com.azure.cosmos.InternalServerErrorException; +import com.azure.cosmos.PartitionIsMigratingException; +import com.azure.cosmos.PartitionKeyRangeGoneException; +import com.azure.cosmos.PartitionKeyRangeIsSplittingException; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.ISessionToken; +import com.azure.cosmos.internal.Integers; +import com.azure.cosmos.internal.MutableVolatile; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.SessionTokenHelper; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.Utils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.slf4j.Logger; @@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import static com.azure.data.cosmos.internal.Exceptions.isSubStatusCode; +import static com.azure.cosmos.internal.Exceptions.isSubStatusCode; public class StoreReader { private final Logger logger = LoggerFactory.getLogger(StoreReader.class); diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/StoreResponse.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/StoreResponse.java index 58960598aaa3..7109ea82a52e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/StoreResponse.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.CosmosResponseDiagnostics; -import com.azure.data.cosmos.internal.HttpConstants; +import com.azure.cosmos.CosmosResponseDiagnostics; +import com.azure.cosmos.internal.HttpConstants; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreResult.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/StoreResult.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreResult.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/StoreResult.java index deda87bee668..4f36a985b4b5 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreResult.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/StoreResult.java @@ -1,17 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.InternalServerErrorException; -import com.azure.data.cosmos.internal.Exceptions; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.ISessionToken; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.RequestChargeTracker; -import com.azure.data.cosmos.internal.Strings; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.InternalServerErrorException; +import com.azure.cosmos.internal.Exceptions; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.ISessionToken; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.RequestChargeTracker; +import com.azure.cosmos.internal.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/TimeoutHelper.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/TimeoutHelper.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/TimeoutHelper.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/TimeoutHelper.java index cb3b4f70bd17..f4bab8a8436a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/TimeoutHelper.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/TimeoutHelper.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.RequestTimeoutException; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.RequestTimeoutException; import java.time.Duration; import java.time.Instant; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/TransportClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/TransportClient.java similarity index 83% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/TransportClient.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/TransportClient.java index 23f9edea4da4..8329278a6f5e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/TransportClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/TransportClient.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import reactor.core.publisher.Mono; import java.net.URI; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/TransportException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/TransportException.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/TransportException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/TransportException.java index bc26e8a0fba0..94de6388f21b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/TransportException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/TransportException.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; // TODO: DANOBLE: Use a TransportException derivative wherever CorruptFrameException is thrown in RntbdTransportClient // * Continue to throw IllegalArgumentException, IllegalStateException, and NullPointerException. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/WFConstants.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/WFConstants.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/WFConstants.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/WFConstants.java index d67a24ae7ffe..c9cc3efcfd5a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/WFConstants.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/WFConstants.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; public class WFConstants { public static class BackendHeaders { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/WebExceptionUtility.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/WebExceptionUtility.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/WebExceptionUtility.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/WebExceptionUtility.java index 08cf6cc10e05..ac1ad1f59b63 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/WebExceptionUtility.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/WebExceptionUtility.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.Utils; import io.netty.channel.ChannelException; import javax.net.ssl.SSLHandshakeException; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelHandler.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelHandler.java similarity index 84% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelHandler.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelHandler.java index 5d8fcf81fe1a..9a2a0d1b775a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelHandler.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelHandler.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import io.netty.channel.Channel; import io.netty.channel.ChannelInitializer; @@ -18,7 +18,6 @@ import java.util.concurrent.TimeUnit; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdEndpoint.Config; import static com.google.common.base.Preconditions.checkNotNull; public class RntbdClientChannelHandler extends ChannelInitializer implements ChannelPoolHandler { @@ -26,9 +25,9 @@ public class RntbdClientChannelHandler extends ChannelInitializer imple private static final AttributeKey REQUEST_MANAGER = AttributeKey.newInstance("requestManager"); private static final Logger logger = LoggerFactory.getLogger(RntbdClientChannelHandler.class); private final ChannelHealthChecker healthChecker; - private final Config config; + private final RntbdEndpoint.Config config; - RntbdClientChannelHandler(final Config config, final ChannelHealthChecker healthChecker) { + RntbdClientChannelHandler(final RntbdEndpoint.Config config, final ChannelHealthChecker healthChecker) { checkNotNull(healthChecker, "healthChecker"); checkNotNull(config, "config"); this.healthChecker = healthChecker; @@ -81,10 +80,10 @@ public void channelReleased(final Channel channel) { * (SslHandler#0 = io.netty.handler.ssl.SslHandler), * (IdleTimeoutHandler#0 = io.netty.handler.timeout.IdleTimeoutHandler), * (LoggingHandler#0 = io.netty.handler.logging.LoggingHandler), // iff RntbdClientChannelHandler.config.wireLogLevel != null - * (RntbdContextNegotiator#0 = com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdContextNegotiator), - * (RntbdResponseDecoder#0 = com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdResponseDecoder), - * (RntbdRequestEncoder#0 = com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdRequestEncoder), - * (RntbdRequestManager#0 = com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdRequestManager), + * (RntbdContextNegotiator#0 = com.azure.cosmos.internal.directconnectivity.rntbd.RntbdContextNegotiator), + * (RntbdResponseDecoder#0 = com.azure.cosmos.internal.directconnectivity.rntbd.RntbdResponseDecoder), + * (RntbdRequestEncoder#0 = com.azure.cosmos.internal.directconnectivity.rntbd.RntbdRequestEncoder), + * (RntbdRequestManager#0 = com.azure.cosmos.internal.directconnectivity.rntbd.RntbdRequestManager), * } * } * diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelHealthChecker.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelHealthChecker.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelHealthChecker.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelHealthChecker.java index 934e05e4fabc..b428611e24df 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelHealthChecker.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelHealthChecker.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdEndpoint.Config; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdEndpoint.Config; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -19,7 +19,7 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdReporter.reportIssueUnless; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdReporter.reportIssueUnless; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static java.util.concurrent.atomic.AtomicLongFieldUpdater.newUpdater; @@ -65,7 +65,7 @@ public final class RntbdClientChannelHealthChecker implements ChannelHealthCheck // region Constructors - public RntbdClientChannelHealthChecker(final Config config) { + public RntbdClientChannelHealthChecker(final RntbdEndpoint.Config config) { checkNotNull(config, "config: null"); @@ -102,7 +102,7 @@ public Future isHealthy(final Channel channel) { final Promise promise = channel.eventLoop().newPromise(); if (requestManager == null) { - reportIssueUnless(logger, !channel.isActive(), channel, "active with no request manager"); + RntbdReporter.reportIssueUnless(logger, !channel.isActive(), channel, "active with no request manager"); return promise.setSuccess(Boolean.FALSE); } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelPool.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelPool.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelPool.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelPool.java index 8e834d6b75bf..bc494ac2c530 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelPool.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdClientChannelPool.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdEndpoint.Config; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdEndpoint.Config; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -35,7 +35,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdReporter.reportIssueUnless; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdReporter.reportIssueUnless; import static com.google.common.base.Preconditions.checkState; /** @@ -441,7 +441,7 @@ private boolean isServiceableOrInactiveChannel(final Channel channel) { final RntbdRequestManager requestManager = channel.pipeline().get(RntbdRequestManager.class); if (requestManager == null) { - reportIssueUnless(logger, !channel.isActive(), channel, "active with no request manager"); + RntbdReporter.reportIssueUnless(logger, !channel.isActive(), channel, "active with no request manager"); return true; // inactive } @@ -562,7 +562,7 @@ public void operationComplete(Future future) { if (completed.isSuccess()) { - reportIssueUnless(logger, this.acquired && requestManager.hasRntbdContext(), + RntbdReporter.reportIssueUnless(logger, this.acquired && requestManager.hasRntbdContext(), channel,"acquired: {}, rntbdContext: {}", this.acquired, requestManager.rntbdContext()); diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdConstants.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdConstants.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdConstants.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdConstants.java index f80162c545ed..fe7dec02e7ff 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdConstants.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdConstants.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContext.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContext.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContext.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContext.java index 6c3f56776908..6d275c3f9f71 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContext.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContext.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; -import com.azure.data.cosmos.internal.directconnectivity.ServerProperties; +import com.azure.cosmos.internal.directconnectivity.ServerProperties; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -15,8 +15,8 @@ import java.util.HashMap; import java.util.UUID; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.CurrentProtocolVersion; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdContextHeader; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.CurrentProtocolVersion; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdContextHeader; import static com.google.common.base.Preconditions.checkState; public final class RntbdContext { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextDecoder.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextDecoder.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextDecoder.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextDecoder.java index 86e94cf7b9db..68a617c8d2c5 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextDecoder.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextDecoder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextException.java similarity index 81% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextException.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextException.java index 575e08459851..16bd1cb4ef58 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextException.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosError; -import com.azure.data.cosmos.internal.directconnectivity.TransportException; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosError; +import com.azure.cosmos.internal.directconnectivity.TransportException; import com.fasterxml.jackson.databind.node.ObjectNode; import io.netty.handler.codec.http.HttpResponseStatus; @@ -37,4 +37,4 @@ public Map getResponseHeaders() { public HttpResponseStatus getStatus() { return status; } -} \ No newline at end of file +} diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextNegotiator.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextNegotiator.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextNegotiator.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextNegotiator.java index 21489ae1f58b..f57a601053f6 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextNegotiator.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextNegotiator.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; -import com.azure.data.cosmos.internal.UserAgentContainer; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.UserAgentContainer; +import com.azure.cosmos.internal.Utils; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import io.netty.channel.ChannelFutureListener; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextRequest.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextRequest.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextRequest.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextRequest.java index 13eda1ccb8b1..93ab35952687 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextRequest.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextRequest.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; -import com.azure.data.cosmos.internal.UserAgentContainer; +import com.azure.cosmos.internal.UserAgentContainer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectWriter; @@ -15,11 +15,11 @@ import java.nio.charset.StandardCharsets; import java.util.UUID; -import static com.azure.data.cosmos.internal.HttpConstants.Versions; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.CurrentProtocolVersion; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdContextRequestHeader; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdOperationType; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdResourceType; +import static com.azure.cosmos.internal.HttpConstants.Versions; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.CurrentProtocolVersion; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdContextRequestHeader; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdOperationType; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdResourceType; public final class RntbdContextRequest { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextRequestDecoder.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextRequestDecoder.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextRequestDecoder.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextRequestDecoder.java index 82dfbd630e0c..5f26a311b312 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextRequestDecoder.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextRequestDecoder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextRequestEncoder.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextRequestEncoder.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextRequestEncoder.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextRequestEncoder.java index b4137911d2b8..23191f183df1 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdContextRequestEncoder.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdContextRequestEncoder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdEndpoint.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdEndpoint.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdEndpoint.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdEndpoint.java index 33ebc20ec124..7730ca4b02ee 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdEndpoint.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdEndpoint.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; -import com.azure.data.cosmos.internal.UserAgentContainer; +import com.azure.cosmos.internal.UserAgentContainer; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import io.micrometer.core.instrument.Tag; @@ -15,7 +15,7 @@ import java.net.URI; import java.util.stream.Stream; -import static com.azure.data.cosmos.internal.directconnectivity.RntbdTransportClient.Options; +import static com.azure.cosmos.internal.directconnectivity.RntbdTransportClient.Options; import static com.google.common.base.Preconditions.checkNotNull; public interface RntbdEndpoint extends AutoCloseable { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdFramer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdFramer.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdFramer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdFramer.java index 6a8a070f2735..eea5230f49bf 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdFramer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdFramer.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import com.google.common.base.Strings; import io.netty.buffer.ByteBuf; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdHealthCheckRequest.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdHealthCheckRequest.java similarity index 82% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdHealthCheckRequest.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdHealthCheckRequest.java index ce2b0347ef3c..506d162a5948 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdHealthCheckRequest.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdHealthCheckRequest.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdMetrics.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdMetrics.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdMetrics.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdMetrics.java index a6f9dc5a5c91..7bff70192636 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdMetrics.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdMetrics.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; -import com.azure.data.cosmos.internal.directconnectivity.RntbdTransportClient; +import com.azure.cosmos.internal.directconnectivity.RntbdTransportClient; import com.codahale.metrics.ConsoleReporter; import com.codahale.metrics.MetricRegistry; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdObjectMapper.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdObjectMapper.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdObjectMapper.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdObjectMapper.java index 6b82c43f93af..dc4c461d6a49 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdObjectMapper.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdObjectMapper.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdReporter.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdReporter.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdReporter.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdReporter.java index 91f36e67f7ad..4057bacc4bc9 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdReporter.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdReporter.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequest.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequest.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequest.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequest.java index deba9ea0d2c5..6b815796f90a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequest.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequest.java @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.base.Strings; import io.netty.buffer.ByteBuf; import java.util.UUID; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdRequestHeader; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdRequestHeader; import static com.google.common.base.Preconditions.checkNotNull; public final class RntbdRequest { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestArgs.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestArgs.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestArgs.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestArgs.java index 2efa46449ada..a7b8b728f2e9 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestArgs.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestArgs.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestDecoder.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestDecoder.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestDecoder.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestDecoder.java index f6be8310fb4a..8a73129fae3a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestDecoder.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestDecoder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestEncoder.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestEncoder.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestEncoder.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestEncoder.java index 5b6520632008..e8873dab893a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestEncoder.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestEncoder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestFrame.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestFrame.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestFrame.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestFrame.java index 53e172414f4d..b9427fd76e39 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestFrame.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestFrame.java @@ -1,17 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.ResourceType; import com.google.common.base.Strings; import io.netty.buffer.ByteBuf; import java.util.UUID; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdOperationType; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdResourceType; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdOperationType; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdResourceType; final class RntbdRequestFrame { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestFramer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestFramer.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestFramer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestFramer.java index 447f6a979e5e..47d1ddd87f52 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestFramer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestFramer.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import io.netty.handler.codec.LengthFieldBasedFrameDecoder; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestHeaders.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestHeaders.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestHeaders.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestHeaders.java index e3223d17cf05..f65680612e0a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestHeaders.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestHeaders.java @@ -1,20 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; - -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.IndexingDirective; -import com.azure.data.cosmos.internal.ContentSerializationFormat; -import com.azure.data.cosmos.internal.EnumerationDirection; -import com.azure.data.cosmos.internal.FanoutOperationState; -import com.azure.data.cosmos.internal.MigrateCollectionDirective; -import com.azure.data.cosmos.internal.Paths; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.ReadFeedKeyType; -import com.azure.data.cosmos.internal.RemoteStorageType; -import com.azure.data.cosmos.internal.ResourceId; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; +package com.azure.cosmos.internal.directconnectivity.rntbd; + +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.IndexingDirective; +import com.azure.cosmos.internal.ContentSerializationFormat; +import com.azure.cosmos.internal.EnumerationDirection; +import com.azure.cosmos.internal.FanoutOperationState; +import com.azure.cosmos.internal.MigrateCollectionDirective; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.ReadFeedKeyType; +import com.azure.cosmos.internal.RemoteStorageType; +import com.azure.cosmos.internal.ResourceId; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import com.fasterxml.jackson.annotation.JsonFilter; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -26,18 +26,18 @@ import java.util.Map; import java.util.function.Supplier; -import static com.azure.data.cosmos.internal.HttpConstants.HttpHeaders; -import static com.azure.data.cosmos.internal.directconnectivity.WFConstants.BackendHeaders; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdConsistencyLevel; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdContentSerializationFormat; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdEnumerationDirection; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdFanoutOperationState; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdIndexingDirective; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdMigrateCollectionDirective; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdOperationType; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdReadFeedKeyType; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdRemoteStorageType; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdRequestHeader; +import static com.azure.cosmos.internal.HttpConstants.HttpHeaders; +import static com.azure.cosmos.internal.directconnectivity.WFConstants.BackendHeaders; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdConsistencyLevel; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdContentSerializationFormat; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdEnumerationDirection; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdFanoutOperationState; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdIndexingDirective; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdMigrateCollectionDirective; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdOperationType; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdReadFeedKeyType; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdRemoteStorageType; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdRequestHeader; import static com.google.common.base.Preconditions.checkNotNull; @JsonFilter("RntbdToken") diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestManager.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestManager.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestManager.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestManager.java index 426242e1804a..cc6b00dd6c6b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestManager.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestManager.java @@ -1,31 +1,31 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; - -import com.azure.data.cosmos.BadRequestException; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConflictException; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.CosmosError; -import com.azure.data.cosmos.ForbiddenException; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.InternalServerErrorException; -import com.azure.data.cosmos.InvalidPartitionException; -import com.azure.data.cosmos.LockedException; -import com.azure.data.cosmos.MethodNotAllowedException; -import com.azure.data.cosmos.NotFoundException; -import com.azure.data.cosmos.PartitionIsMigratingException; -import com.azure.data.cosmos.PartitionKeyRangeGoneException; -import com.azure.data.cosmos.PartitionKeyRangeIsSplittingException; -import com.azure.data.cosmos.PreconditionFailedException; -import com.azure.data.cosmos.RequestEntityTooLargeException; -import com.azure.data.cosmos.RequestRateTooLargeException; -import com.azure.data.cosmos.RequestTimeoutException; -import com.azure.data.cosmos.RetryWithException; -import com.azure.data.cosmos.ServiceUnavailableException; -import com.azure.data.cosmos.UnauthorizedException; -import com.azure.data.cosmos.internal.directconnectivity.StoreResponse; +package com.azure.cosmos.internal.directconnectivity.rntbd; + +import com.azure.cosmos.BadRequestException; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConflictException; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosError; +import com.azure.cosmos.ForbiddenException; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.InternalServerErrorException; +import com.azure.cosmos.InvalidPartitionException; +import com.azure.cosmos.LockedException; +import com.azure.cosmos.MethodNotAllowedException; +import com.azure.cosmos.NotFoundException; +import com.azure.cosmos.PartitionIsMigratingException; +import com.azure.cosmos.PartitionKeyRangeGoneException; +import com.azure.cosmos.PartitionKeyRangeIsSplittingException; +import com.azure.cosmos.PreconditionFailedException; +import com.azure.cosmos.RequestEntityTooLargeException; +import com.azure.cosmos.RequestRateTooLargeException; +import com.azure.cosmos.RequestTimeoutException; +import com.azure.cosmos.RetryWithException; +import com.azure.cosmos.ServiceUnavailableException; +import com.azure.cosmos.UnauthorizedException; +import com.azure.cosmos.internal.directconnectivity.StoreResponse; import com.google.common.base.Strings; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; @@ -60,10 +60,10 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes; -import static com.azure.data.cosmos.internal.HttpConstants.SubStatusCodes; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdClientChannelHealthChecker.Timestamps; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdResponseHeader; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes; +import static com.azure.cosmos.internal.HttpConstants.SubStatusCodes; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdClientChannelHealthChecker.Timestamps; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdResponseHeader; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -87,7 +87,7 @@ public final class RntbdRequestManager implements ChannelHandler, ChannelInbound private final ChannelHealthChecker healthChecker; private final int pendingRequestLimit; private final ConcurrentHashMap pendingRequests; - private final Timestamps timestamps = new Timestamps(); + private final RntbdClientChannelHealthChecker.Timestamps timestamps = new RntbdClientChannelHealthChecker.Timestamps(); private boolean closingExceptionally = false; private CoalescingBufferQueue pendingWrites; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestRecord.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestRecord.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestRecord.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestRecord.java index d983db42b347..db4645fe6916 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestRecord.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestRecord.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.RequestTimeoutException; -import com.azure.data.cosmos.internal.directconnectivity.StoreResponse; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.RequestTimeoutException; +import com.azure.cosmos.internal.directconnectivity.StoreResponse; import io.micrometer.core.instrument.Timer; import io.netty.util.Timeout; import io.netty.util.TimerTask; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestTimer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestTimer.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestTimer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestTimer.java index 2b67953b7c46..55d03936dff5 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdRequestTimer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdRequestTimer.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import io.netty.util.HashedWheelTimer; import io.netty.util.Timeout; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdResponse.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdResponse.java index 279189b1247e..805a03bd3b21 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdResponse.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; -import com.azure.data.cosmos.internal.directconnectivity.StoreResponse; +import com.azure.cosmos.internal.directconnectivity.StoreResponse; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -24,7 +24,7 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdResponseHeader; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdResponseHeader; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static java.lang.Math.min; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdResponseDecoder.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdResponseDecoder.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdResponseDecoder.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdResponseDecoder.java index 1c963e97cfd4..4fafc925174f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdResponseDecoder.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdResponseDecoder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdResponseHeaders.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdResponseHeaders.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdResponseHeaders.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdResponseHeaders.java index c2732927b90c..f9fb76c3dda1 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdResponseHeaders.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdResponseHeaders.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonProperty; @@ -21,10 +21,10 @@ import java.util.function.BiConsumer; import java.util.function.Function; -import static com.azure.data.cosmos.internal.HttpConstants.HttpHeaders; -import static com.azure.data.cosmos.internal.directconnectivity.WFConstants.BackendHeaders; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdIndexingDirective; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdResponseHeader; +import static com.azure.cosmos.internal.HttpConstants.HttpHeaders; +import static com.azure.cosmos.internal.directconnectivity.WFConstants.BackendHeaders; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdIndexingDirective; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdResponseHeader; @JsonFilter("RntbdToken") class RntbdResponseHeaders extends RntbdTokenStream { @@ -223,7 +223,7 @@ public Map asMap(final RntbdContext context, final UUID activity static RntbdResponseHeaders decode(final ByteBuf in) { final RntbdResponseHeaders headers = new RntbdResponseHeaders(in); - RntbdTokenStream.decode(headers); + decode(headers); return headers; } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdResponseStatus.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdResponseStatus.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdResponseStatus.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdResponseStatus.java index 30332ca7870f..cba4484a417e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdResponseStatus.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdResponseStatus.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdServiceEndpoint.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdServiceEndpoint.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdServiceEndpoint.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdServiceEndpoint.java index d3a4e6466b2e..365d00f077ca 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdServiceEndpoint.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdServiceEndpoint.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.internal.directconnectivity.RntbdTransportClient; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.internal.directconnectivity.RntbdTransportClient; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -37,8 +37,8 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Stream; -import static com.azure.data.cosmos.internal.HttpConstants.HttpHeaders; -import static com.azure.data.cosmos.internal.directconnectivity.RntbdTransportClient.Options; +import static com.azure.cosmos.internal.HttpConstants.HttpHeaders; +import static com.azure.cosmos.internal.directconnectivity.RntbdTransportClient.Options; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdToken.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdToken.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdToken.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdToken.java index 8bb5f7f7f095..53d67abfe9f2 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdToken.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdToken.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -13,7 +13,7 @@ import com.google.common.base.Strings; import io.netty.buffer.ByteBuf; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdHeader; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdHeader; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdTokenStream.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdTokenStream.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdTokenStream.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdTokenStream.java index 9c60d50d71f7..72eafe920a3a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdTokenStream.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdTokenStream.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; @@ -11,7 +11,7 @@ import java.util.stream.Collector; -import static com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdHeader; +import static com.azure.cosmos.internal.directconnectivity.rntbd.RntbdConstants.RntbdHeader; import static com.google.common.base.Preconditions.checkNotNull; @SuppressWarnings("UnstableApiUsage") diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdTokenType.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdTokenType.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdTokenType.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdTokenType.java index 3d31340966d7..c34f1884c305 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdTokenType.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdTokenType.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import com.google.common.base.Strings; import com.google.common.base.Utf8; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdUUID.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdUUID.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdUUID.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdUUID.java index c66bcf4a73f6..bd903fd4a311 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/rntbd/RntbdUUID.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/directconnectivity/rntbd/RntbdUUID.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity.rntbd; +package com.azure.cosmos.internal.directconnectivity.rntbd; import com.google.common.base.Strings; import io.netty.buffer.ByteBuf; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/BufferedHttpResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/BufferedHttpResponse.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/BufferedHttpResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/BufferedHttpResponse.java index bad4c3cc57e7..5939d11dd5f3 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/BufferedHttpResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/BufferedHttpResponse.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.http; +package com.azure.cosmos.internal.http; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpClient.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpClient.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpClient.java index 896022d77064..df43199fb09b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpClient.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.http; +package com.azure.cosmos.internal.http; import reactor.core.publisher.Mono; import reactor.netty.resources.ConnectionProvider; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpClientConfig.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpClientConfig.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpClientConfig.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpClientConfig.java index 6be4ea5ccf49..0ea10ef2205c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpClientConfig.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpClientConfig.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.http; +package com.azure.cosmos.internal.http; -import com.azure.data.cosmos.internal.Configs; +import com.azure.cosmos.internal.Configs; import java.net.InetSocketAddress; @@ -11,7 +11,7 @@ * Helper class internally used for instantiating reactor netty http client. */ public class HttpClientConfig { - public final static String REACTOR_NETWORK_LOG_CATEGORY = "com.azure.data.cosmos.netty-network"; + public final static String REACTOR_NETWORK_LOG_CATEGORY = "com.azure.cosmos.netty-network"; private final Configs configs; private Integer maxPoolSize; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpHeader.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpHeader.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpHeader.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpHeader.java index 3b2c30d65687..327e27889210 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpHeader.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpHeader.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.http; +package com.azure.cosmos.internal.http; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpHeaders.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpHeaders.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpHeaders.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpHeaders.java index 363d81825dbc..7bf495c5c58a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpHeaders.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpHeaders.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.http; +package com.azure.cosmos.internal.http; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializable; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpRequest.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpRequest.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpRequest.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpRequest.java index cd0c3c0efadb..5f8138769c2b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpRequest.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpRequest.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.http; +package com.azure.cosmos.internal.http; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpResponse.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpResponse.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpResponse.java index 4ccc799132ee..402851bad31f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/HttpResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/HttpResponse.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.http; +package com.azure.cosmos.internal.http; import io.netty.buffer.ByteBuf; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/ReactorNettyClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/ReactorNettyClient.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/ReactorNettyClient.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/ReactorNettyClient.java index e0092c8bc468..936bcc75cf8b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/http/ReactorNettyClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/http/ReactorNettyClient.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.http; +package com.azure.cosmos.internal.http; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -24,7 +24,7 @@ import java.util.Objects; import java.util.function.BiFunction; -import static com.azure.data.cosmos.internal.http.HttpClientConfig.REACTOR_NETWORK_LOG_CATEGORY; +import static com.azure.cosmos.internal.http.HttpClientConfig.REACTOR_NETWORK_LOG_CATEGORY; /** * HttpClient that is implemented using reactor-netty. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/AggregateDocumentQueryExecutionContext.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/AggregateDocumentQueryExecutionContext.java similarity index 80% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/AggregateDocumentQueryExecutionContext.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/AggregateDocumentQueryExecutionContext.java index 244693f44302..a2902d77a6c5 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/AggregateDocumentQueryExecutionContext.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/AggregateDocumentQueryExecutionContext.java @@ -1,23 +1,30 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.Undefined; -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.QueryMetrics; -import com.azure.data.cosmos.internal.query.aggregation.AggregateOperator; -import com.azure.data.cosmos.internal.query.aggregation.Aggregator; -import com.azure.data.cosmos.internal.query.aggregation.AverageAggregator; -import com.azure.data.cosmos.internal.query.aggregation.CountAggregator; -import com.azure.data.cosmos.internal.query.aggregation.MaxAggregator; -import com.azure.data.cosmos.internal.query.aggregation.MinAggregator; -import com.azure.data.cosmos.internal.query.aggregation.SumAggregator; +import com.azure.cosmos.internal.query.aggregation.AggregateOperator; +import com.azure.cosmos.internal.query.aggregation.Aggregator; +import com.azure.cosmos.internal.query.aggregation.AverageAggregator; +import com.azure.cosmos.internal.query.aggregation.CountAggregator; +import com.azure.cosmos.internal.query.aggregation.MaxAggregator; +import com.azure.cosmos.internal.query.aggregation.MinAggregator; +import com.azure.cosmos.internal.query.aggregation.SumAggregator; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.Undefined; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.QueryMetrics; +import com.azure.cosmos.internal.query.aggregation.AggregateOperator; +import com.azure.cosmos.internal.query.aggregation.Aggregator; +import com.azure.cosmos.internal.query.aggregation.AverageAggregator; +import com.azure.cosmos.internal.query.aggregation.CountAggregator; +import com.azure.cosmos.internal.query.aggregation.MaxAggregator; +import com.azure.cosmos.internal.query.aggregation.MinAggregator; +import com.azure.cosmos.internal.query.aggregation.SumAggregator; import reactor.core.publisher.Flux; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/CompositeContinuationToken.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/CompositeContinuationToken.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/CompositeContinuationToken.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/CompositeContinuationToken.java index a7abd0ace241..a6a8ce8671ba 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/CompositeContinuationToken.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/CompositeContinuationToken.java @@ -1,12 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.JsonSerializable; -import com.azure.data.cosmos.internal.Utils.ValueHolder; -import com.azure.data.cosmos.internal.routing.Range; +import com.azure.cosmos.internal.routing.Range; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.JsonSerializable; +import com.azure.cosmos.internal.Utils.ValueHolder; +import com.azure.cosmos.internal.routing.Range; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DefaultDocumentQueryExecutionContext.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/DefaultDocumentQueryExecutionContext.java similarity index 82% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DefaultDocumentQueryExecutionContext.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/DefaultDocumentQueryExecutionContext.java index b4257dc2f98f..a417481bc052 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DefaultDocumentQueryExecutionContext.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/DefaultDocumentQueryExecutionContext.java @@ -1,34 +1,43 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.SqlQuerySpec; -import com.azure.data.cosmos.internal.BackoffRetryUtility; -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IDocumentClientRetryPolicy; -import com.azure.data.cosmos.internal.InvalidPartitionExceptionRetryPolicy; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.PartitionKeyRangeGoneRetryPolicy; -import com.azure.data.cosmos.internal.PathsHelper; -import com.azure.data.cosmos.internal.QueryMetrics; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.Utils.ValueHolder; -import com.azure.data.cosmos.internal.caches.IPartitionKeyRangeCache; -import com.azure.data.cosmos.internal.caches.RxCollectionCache; -import com.azure.data.cosmos.internal.query.metrics.ClientSideMetrics; -import com.azure.data.cosmos.internal.query.metrics.FetchExecutionRangeAccumulator; -import com.azure.data.cosmos.internal.query.metrics.SchedulingStopwatch; -import com.azure.data.cosmos.internal.query.metrics.SchedulingTimeSpan; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternal; -import com.azure.data.cosmos.internal.routing.PartitionKeyRangeIdentity; -import com.azure.data.cosmos.internal.routing.Range; +package com.azure.cosmos.internal.query; + +import com.azure.cosmos.internal.caches.IPartitionKeyRangeCache; +import com.azure.cosmos.internal.caches.RxCollectionCache; +import com.azure.cosmos.internal.query.metrics.ClientSideMetrics; +import com.azure.cosmos.internal.query.metrics.FetchExecutionRangeAccumulator; +import com.azure.cosmos.internal.query.metrics.SchedulingStopwatch; +import com.azure.cosmos.internal.query.metrics.SchedulingTimeSpan; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; +import com.azure.cosmos.internal.routing.Range; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.BackoffRetryUtility; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IDocumentClientRetryPolicy; +import com.azure.cosmos.internal.InvalidPartitionExceptionRetryPolicy; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.PartitionKeyRangeGoneRetryPolicy; +import com.azure.cosmos.internal.PathsHelper; +import com.azure.cosmos.internal.QueryMetrics; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.Utils.ValueHolder; +import com.azure.cosmos.internal.caches.IPartitionKeyRangeCache; +import com.azure.cosmos.internal.caches.RxCollectionCache; +import com.azure.cosmos.internal.query.metrics.ClientSideMetrics; +import com.azure.cosmos.internal.query.metrics.FetchExecutionRangeAccumulator; +import com.azure.cosmos.internal.query.metrics.SchedulingStopwatch; +import com.azure.cosmos.internal.query.metrics.SchedulingTimeSpan; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; +import com.azure.cosmos.internal.routing.Range; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import reactor.core.publisher.Flux; @@ -41,7 +50,7 @@ import java.util.function.BiFunction; import java.util.function.Function; -import static com.azure.data.cosmos.CommonsBridgeInternal.partitionKeyRangeIdInternal; +import static com.azure.cosmos.CommonsBridgeInternal.partitionKeyRangeIdInternal; /** * While this class is public, but it is not part of our published public APIs. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DocumentProducer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/DocumentProducer.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DocumentProducer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/DocumentProducer.java index 58d756d4f4db..42107b4ca7b3 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DocumentProducer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/DocumentProducer.java @@ -1,27 +1,32 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.JsonSerializable; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.Exceptions; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IDocumentClientRetryPolicy; -import com.azure.data.cosmos.internal.ObservableHelper; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.QueryMetrics; -import com.azure.data.cosmos.internal.QueryMetricsConstants; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.Utils; -import com.azure.data.cosmos.internal.query.metrics.ClientSideMetrics; -import com.azure.data.cosmos.internal.query.metrics.FetchExecutionRangeAccumulator; -import com.azure.data.cosmos.internal.query.metrics.SchedulingStopwatch; -import com.azure.data.cosmos.internal.query.metrics.SchedulingTimeSpan; -import com.azure.data.cosmos.internal.routing.Range; +package com.azure.cosmos.internal.query; + +import com.azure.cosmos.internal.query.metrics.ClientSideMetrics; +import com.azure.cosmos.internal.query.metrics.FetchExecutionRangeAccumulator; +import com.azure.cosmos.internal.query.metrics.SchedulingStopwatch; +import com.azure.cosmos.internal.query.metrics.SchedulingTimeSpan; +import com.azure.cosmos.internal.routing.Range; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.JsonSerializable; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.Exceptions; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IDocumentClientRetryPolicy; +import com.azure.cosmos.internal.ObservableHelper; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.QueryMetrics; +import com.azure.cosmos.internal.QueryMetricsConstants; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.query.metrics.ClientSideMetrics; +import com.azure.cosmos.internal.query.metrics.FetchExecutionRangeAccumulator; +import com.azure.cosmos.internal.query.metrics.SchedulingStopwatch; +import com.azure.cosmos.internal.query.metrics.SchedulingTimeSpan; +import com.azure.cosmos.internal.routing.Range; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.slf4j.Logger; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DocumentQueryExecutionContextBase.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/DocumentQueryExecutionContextBase.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DocumentQueryExecutionContextBase.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/DocumentQueryExecutionContextBase.java index 9f8de788cc1f..4029736d0c0f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DocumentQueryExecutionContextBase.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/DocumentQueryExecutionContextBase.java @@ -1,26 +1,28 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.SqlParameterList; -import com.azure.data.cosmos.SqlQuerySpec; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.ReplicatedResourceClientUtils; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RuntimeConstants.MediaTypes; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.RxDocumentServiceResponse; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.Utils; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternal; -import com.azure.data.cosmos.internal.routing.PartitionKeyRangeIdentity; +package com.azure.cosmos.internal.query; + +import com.azure.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.SqlParameterList; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.ReplicatedResourceClientUtils; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RuntimeConstants.MediaTypes; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.RxDocumentServiceResponse; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DocumentQueryExecutionContextFactory.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/DocumentQueryExecutionContextFactory.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DocumentQueryExecutionContextFactory.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/DocumentQueryExecutionContextFactory.java index bd015915cef8..7db0cdf00e4c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DocumentQueryExecutionContextFactory.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/DocumentQueryExecutionContextFactory.java @@ -1,20 +1,21 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; - -import com.azure.data.cosmos.BadRequestException; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.SqlQuerySpec; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.Utils; -import com.azure.data.cosmos.internal.caches.RxCollectionCache; +package com.azure.cosmos.internal.query; + +import com.azure.cosmos.internal.caches.RxCollectionCache; +import com.azure.cosmos.BadRequestException; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.Resource; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.caches.RxCollectionCache; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ExceptionHelper.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ExceptionHelper.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ExceptionHelper.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ExceptionHelper.java index 5fb62b14dc67..f91607f0dc1a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ExceptionHelper.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ExceptionHelper.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; import java.util.concurrent.ExecutionException; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/Fetcher.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/Fetcher.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/Fetcher.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/Fetcher.java index 98125218095b..55b1c0e8161e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/Fetcher.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/Fetcher.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/IDocumentQueryClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/IDocumentQueryClient.java similarity index 77% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/IDocumentQueryClient.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/IDocumentQueryClient.java index 21c811386f99..aab950925fa6 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/IDocumentQueryClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/IDocumentQueryClient.java @@ -1,13 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.internal.IRetryPolicyFactory; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.RxDocumentServiceResponse; -import com.azure.data.cosmos.internal.caches.IPartitionKeyRangeCache; -import com.azure.data.cosmos.internal.caches.RxCollectionCache; +import com.azure.cosmos.internal.caches.IPartitionKeyRangeCache; +import com.azure.cosmos.internal.caches.RxCollectionCache; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.internal.IRetryPolicyFactory; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.RxDocumentServiceResponse; +import com.azure.cosmos.internal.caches.IPartitionKeyRangeCache; +import com.azure.cosmos.internal.caches.RxCollectionCache; import reactor.core.publisher.Mono; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/IDocumentQueryExecutionComponent.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/IDocumentQueryExecutionComponent.java similarity index 76% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/IDocumentQueryExecutionComponent.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/IDocumentQueryExecutionComponent.java index 64a2d894bbb6..b7db63e1e501 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/IDocumentQueryExecutionComponent.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/IDocumentQueryExecutionComponent.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; import reactor.core.publisher.Flux; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/IDocumentQueryExecutionContext.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/IDocumentQueryExecutionContext.java similarity index 75% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/IDocumentQueryExecutionContext.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/IDocumentQueryExecutionContext.java index 13d2d45767c5..3931f03d2d59 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/IDocumentQueryExecutionContext.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/IDocumentQueryExecutionContext.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; import reactor.core.publisher.Flux; /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ItemComparator.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ItemComparator.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ItemComparator.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ItemComparator.java index eb0c2cf2afdb..c67708db28db 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ItemComparator.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ItemComparator.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; import java.util.Comparator; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ItemType.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ItemType.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ItemType.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ItemType.java index d3c88c06663e..a375068cd705 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ItemType.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ItemType.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; public enum ItemType { NoValue(0x0), Null(0x1), Boolean(0x2), Number(0x4), String(0x5); diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ItemTypeHelper.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ItemTypeHelper.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ItemTypeHelper.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ItemTypeHelper.java index 2ad0fff7c348..56d68f4b9115 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ItemTypeHelper.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ItemTypeHelper.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.internal.Undefined; +import com.azure.cosmos.internal.Undefined; public final class ItemTypeHelper { public static ItemType getOrderByItemType(Object obj) { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/OrderByContinuationToken.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/OrderByContinuationToken.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/OrderByContinuationToken.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/OrderByContinuationToken.java index f263513c43f3..192b6ce90d2c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/OrderByContinuationToken.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/OrderByContinuationToken.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.JsonSerializable; -import com.azure.data.cosmos.internal.Utils.ValueHolder; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.JsonSerializable; +import com.azure.cosmos.internal.Utils.ValueHolder; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import org.slf4j.Logger; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/OrderByDocumentProducer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/OrderByDocumentProducer.java similarity index 81% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/OrderByDocumentProducer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/OrderByDocumentProducer.java index 5da393acb7d7..d25160c56f48 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/OrderByDocumentProducer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/OrderByDocumentProducer.java @@ -1,20 +1,22 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IDocumentClientRetryPolicy; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.QueryMetrics; -import com.azure.data.cosmos.internal.RequestChargeTracker; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.Utils; -import com.azure.data.cosmos.internal.query.orderbyquery.OrderByRowResult; -import com.azure.data.cosmos.internal.query.orderbyquery.OrderbyRowComparer; +import com.azure.cosmos.internal.query.orderbyquery.OrderByRowResult; +import com.azure.cosmos.internal.query.orderbyquery.OrderbyRowComparer; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IDocumentClientRetryPolicy; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.QueryMetrics; +import com.azure.cosmos.internal.RequestChargeTracker; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.query.orderbyquery.OrderByRowResult; +import com.azure.cosmos.internal.query.orderbyquery.OrderbyRowComparer; import reactor.core.publisher.Flux; import java.util.Collections; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/OrderByDocumentQueryExecutionContext.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/OrderByDocumentQueryExecutionContext.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/OrderByDocumentQueryExecutionContext.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/OrderByDocumentQueryExecutionContext.java index 3af333069f1f..b94d6edffa82 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/OrderByDocumentQueryExecutionContext.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/OrderByDocumentQueryExecutionContext.java @@ -1,25 +1,28 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.SqlQuerySpec; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IDocumentClientRetryPolicy; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.QueryMetrics; -import com.azure.data.cosmos.internal.RequestChargeTracker; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.Utils; -import com.azure.data.cosmos.internal.Utils.ValueHolder; -import com.azure.data.cosmos.internal.query.orderbyquery.OrderByRowResult; -import com.azure.data.cosmos.internal.query.orderbyquery.OrderbyRowComparer; -import com.azure.data.cosmos.internal.routing.Range; +package com.azure.cosmos.internal.query; + +import com.azure.cosmos.internal.query.orderbyquery.OrderByRowResult; +import com.azure.cosmos.internal.query.orderbyquery.OrderbyRowComparer; +import com.azure.cosmos.internal.routing.Range; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IDocumentClientRetryPolicy; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.QueryMetrics; +import com.azure.cosmos.internal.RequestChargeTracker; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.Utils.ValueHolder; +import com.azure.cosmos.internal.query.orderbyquery.OrderByRowResult; +import com.azure.cosmos.internal.query.orderbyquery.OrderbyRowComparer; +import com.azure.cosmos.internal.routing.Range; import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.lang3.tuple.ImmutablePair; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/OrderByUtils.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/OrderByUtils.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/OrderByUtils.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/OrderByUtils.java index f2f1a181951d..a60abfefe04c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/OrderByUtils.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/OrderByUtils.java @@ -1,15 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; - -import com.azure.data.cosmos.BadRequestException; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.QueryMetrics; -import com.azure.data.cosmos.internal.RequestChargeTracker; -import com.azure.data.cosmos.internal.ResourceId; -import com.azure.data.cosmos.internal.query.orderbyquery.OrderByRowResult; -import com.azure.data.cosmos.internal.query.orderbyquery.OrderbyRowComparer; +package com.azure.cosmos.internal.query; + +import com.azure.cosmos.internal.query.orderbyquery.OrderByRowResult; +import com.azure.cosmos.internal.query.orderbyquery.OrderbyRowComparer; +import com.azure.cosmos.BadRequestException; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.QueryMetrics; +import com.azure.cosmos.internal.RequestChargeTracker; +import com.azure.cosmos.internal.ResourceId; +import com.azure.cosmos.internal.query.orderbyquery.OrderByRowResult; +import com.azure.cosmos.internal.query.orderbyquery.OrderbyRowComparer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import org.apache.commons.lang3.tuple.Pair; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/Paginator.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/Paginator.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/Paginator.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/Paginator.java index 35162baa466b..6140537681e2 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/Paginator.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/Paginator.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.ChangeFeedOptions; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.ChangeFeedOptions; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ParallelDocumentQueryExecutionContext.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ParallelDocumentQueryExecutionContext.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ParallelDocumentQueryExecutionContext.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ParallelDocumentQueryExecutionContext.java index d0340df73b65..0f91fbb71b47 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ParallelDocumentQueryExecutionContext.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ParallelDocumentQueryExecutionContext.java @@ -1,21 +1,21 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.SqlQuerySpec; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IDocumentClientRetryPolicy; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.RequestChargeTracker; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.Utils; -import com.azure.data.cosmos.internal.Utils.ValueHolder; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IDocumentClientRetryPolicy; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.RequestChargeTracker; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.Utils.ValueHolder; import org.apache.commons.lang3.tuple.ImmutablePair; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ParallelDocumentQueryExecutionContextBase.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ParallelDocumentQueryExecutionContextBase.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ParallelDocumentQueryExecutionContextBase.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ParallelDocumentQueryExecutionContextBase.java index d342f09ade96..2f83e1fb3402 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ParallelDocumentQueryExecutionContextBase.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ParallelDocumentQueryExecutionContextBase.java @@ -1,20 +1,21 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.SqlQuerySpec; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IDocumentClientRetryPolicy; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.routing.Range; +package com.azure.cosmos.internal.query; + +import com.azure.cosmos.internal.routing.Range; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IDocumentClientRetryPolicy; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.routing.Range; import reactor.core.publisher.Flux; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ParallelQueryConfig.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ParallelQueryConfig.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ParallelQueryConfig.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ParallelQueryConfig.java index 5966414ba73c..ea4aaf6b3645 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ParallelQueryConfig.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ParallelQueryConfig.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; /** * While this class is public, but it is not part of our published public APIs. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/PartitionedQueryExecutionInfo.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/PartitionedQueryExecutionInfo.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/PartitionedQueryExecutionInfo.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/PartitionedQueryExecutionInfo.java index 96fd8c5972ef..e69a72646492 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/PartitionedQueryExecutionInfo.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/PartitionedQueryExecutionInfo.java @@ -1,12 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.JsonSerializable; -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.routing.Range; +import com.azure.cosmos.internal.routing.Range; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.JsonSerializable; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.routing.Range; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/PartitionedQueryExecutionInfoInternal.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/PartitionedQueryExecutionInfoInternal.java similarity index 83% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/PartitionedQueryExecutionInfoInternal.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/PartitionedQueryExecutionInfoInternal.java index 8d26ded202f3..72576e344ab2 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/PartitionedQueryExecutionInfoInternal.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/PartitionedQueryExecutionInfoInternal.java @@ -1,14 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.JsonSerializable; -import com.azure.data.cosmos.internal.Constants; -import com.azure.data.cosmos.internal.Utils; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternal; -import com.azure.data.cosmos.internal.routing.Range; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.routing.Range; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.JsonSerializable; +import com.azure.cosmos.internal.Constants; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.routing.Range; import com.fasterxml.jackson.core.JsonProcessingException; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/PipelinedDocumentQueryExecutionContext.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/PipelinedDocumentQueryExecutionContext.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/PipelinedDocumentQueryExecutionContext.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/PipelinedDocumentQueryExecutionContext.java index af8760bf79eb..743eac7e456d 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/PipelinedDocumentQueryExecutionContext.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/PipelinedDocumentQueryExecutionContext.java @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; - -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.SqlQuerySpec; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.Utils; +package com.azure.cosmos.internal.query; + +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.Utils; import reactor.core.publisher.Flux; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ProxyDocumentQueryExecutionContext.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ProxyDocumentQueryExecutionContext.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ProxyDocumentQueryExecutionContext.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ProxyDocumentQueryExecutionContext.java index 9d6d81245faf..9c74183687ca 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/ProxyDocumentQueryExecutionContext.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/ProxyDocumentQueryExecutionContext.java @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; - -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.SqlQuerySpec; -import com.azure.data.cosmos.internal.Exceptions; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.Utils; +package com.azure.cosmos.internal.query; + +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.Exceptions; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/QueryInfo.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/QueryInfo.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/QueryInfo.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/QueryInfo.java index 5c641f6044ce..cf7299354279 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/QueryInfo.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/QueryInfo.java @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.JsonSerializable; -import com.azure.data.cosmos.internal.query.aggregation.AggregateOperator; +import com.azure.cosmos.internal.query.aggregation.AggregateOperator; +import com.azure.cosmos.JsonSerializable; +import com.azure.cosmos.internal.query.aggregation.AggregateOperator; import org.apache.commons.lang3.StringUtils; import java.util.Collection; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/QueryItem.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/QueryItem.java similarity index 79% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/QueryItem.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/QueryItem.java index e3386e5fe0b3..f546ec2e4c03 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/QueryItem.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/QueryItem.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.JsonSerializable; -import com.azure.data.cosmos.internal.Undefined; +import com.azure.cosmos.JsonSerializable; +import com.azure.cosmos.internal.Undefined; /** * Used internally for query in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/SortOrder.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/SortOrder.java similarity index 82% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/SortOrder.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/SortOrder.java index de628dda0d04..f7e1848ed1f1 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/SortOrder.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/SortOrder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; /** * Sort order in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/TakeContinuationToken.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/TakeContinuationToken.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/TakeContinuationToken.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/TakeContinuationToken.java index 2a2284b805f6..105c491eaf5a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/TakeContinuationToken.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/TakeContinuationToken.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.JsonSerializable; -import com.azure.data.cosmos.internal.Utils.ValueHolder; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.JsonSerializable; +import com.azure.cosmos.internal.Utils.ValueHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/TopDocumentQueryExecutionContext.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/TopDocumentQueryExecutionContext.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/TopDocumentQueryExecutionContext.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/TopDocumentQueryExecutionContext.java index f9b9541ab6a4..5c9eb1b709eb 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/TopDocumentQueryExecutionContext.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/TopDocumentQueryExecutionContext.java @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.Utils.ValueHolder; +package com.azure.cosmos.internal.query; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.Utils.ValueHolder; import reactor.core.publisher.Flux; import java.util.HashMap; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/TriFunction.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/TriFunction.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/TriFunction.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/TriFunction.java index ea7d4b59e7ca..98a5d65199a7 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/TriFunction.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/TriFunction.java @@ -1,4 +1,4 @@ -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; /** * A functional interface (callback) that computes a value based on multiple input values. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/AggregateOperator.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/AggregateOperator.java similarity index 75% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/AggregateOperator.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/AggregateOperator.java index e0a62b1655f5..954eb1c76989 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/AggregateOperator.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/AggregateOperator.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.aggregation; +package com.azure.cosmos.internal.query.aggregation; public enum AggregateOperator { Average, diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/Aggregator.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/Aggregator.java similarity index 76% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/Aggregator.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/Aggregator.java index 3d7b223f6bda..770d35bfe875 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/Aggregator.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/Aggregator.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.aggregation; +package com.azure.cosmos.internal.query.aggregation; public interface Aggregator { void aggregate(Object item); diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/AverageAggregator.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/AverageAggregator.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/AverageAggregator.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/AverageAggregator.java index 10d98ec5ad90..604aaa0fe8d0 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/AverageAggregator.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/AverageAggregator.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.aggregation; +package com.azure.cosmos.internal.query.aggregation; -import com.azure.data.cosmos.internal.Undefined; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.Undefined; +import com.azure.cosmos.internal.Utils; import java.io.IOException; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/CountAggregator.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/CountAggregator.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/CountAggregator.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/CountAggregator.java index b368c998216a..262cd9d8316c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/CountAggregator.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/CountAggregator.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.aggregation; +package com.azure.cosmos.internal.query.aggregation; public class CountAggregator implements Aggregator { private long value; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/MaxAggregator.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/MaxAggregator.java similarity index 78% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/MaxAggregator.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/MaxAggregator.java index 03b98fed1b01..2e9ac1a29613 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/MaxAggregator.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/MaxAggregator.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.aggregation; +package com.azure.cosmos.internal.query.aggregation; -import com.azure.data.cosmos.internal.Undefined; -import com.azure.data.cosmos.internal.query.ItemComparator; +import com.azure.cosmos.internal.Undefined; +import com.azure.cosmos.internal.query.ItemComparator; public class MaxAggregator implements Aggregator { private Object value; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/MinAggregator.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/MinAggregator.java similarity index 78% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/MinAggregator.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/MinAggregator.java index 0e330b95fd4c..7b0aae56d06b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/MinAggregator.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/MinAggregator.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.aggregation; +package com.azure.cosmos.internal.query.aggregation; -import com.azure.data.cosmos.internal.Undefined; -import com.azure.data.cosmos.internal.query.ItemComparator; +import com.azure.cosmos.internal.Undefined; +import com.azure.cosmos.internal.query.ItemComparator; public class MinAggregator implements Aggregator { private Object value; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/SumAggregator.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/SumAggregator.java similarity index 84% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/SumAggregator.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/SumAggregator.java index d1eccafa7fb5..6fabb98e6782 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/aggregation/SumAggregator.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/aggregation/SumAggregator.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.aggregation; +package com.azure.cosmos.internal.query.aggregation; -import com.azure.data.cosmos.internal.Undefined; +import com.azure.cosmos.internal.Undefined; public class SumAggregator implements Aggregator { private Double sum; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/ClientSideMetrics.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/ClientSideMetrics.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/ClientSideMetrics.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/ClientSideMetrics.java index b629eae3e75c..daa558c6695a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/ClientSideMetrics.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/ClientSideMetrics.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.metrics; +package com.azure.cosmos.internal.query.metrics; import org.apache.commons.lang3.tuple.ImmutablePair; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/FetchExecutionRange.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/FetchExecutionRange.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/FetchExecutionRange.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/FetchExecutionRange.java index d2fea93e3f51..592057231c44 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/FetchExecutionRange.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/FetchExecutionRange.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.metrics; +package com.azure.cosmos.internal.query.metrics; import java.time.Instant; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/FetchExecutionRangeAccumulator.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/FetchExecutionRangeAccumulator.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/FetchExecutionRangeAccumulator.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/FetchExecutionRangeAccumulator.java index 8ee15922ddef..bd6f4b372eb4 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/FetchExecutionRangeAccumulator.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/FetchExecutionRangeAccumulator.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.metrics; +package com.azure.cosmos.internal.query.metrics; import org.apache.commons.lang3.time.StopWatch; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/QueryMetricsTextWriter.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/QueryMetricsTextWriter.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/QueryMetricsTextWriter.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/QueryMetricsTextWriter.java index 4cbfc94cc568..d6a9a2950a35 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/QueryMetricsTextWriter.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/QueryMetricsTextWriter.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.metrics; +package com.azure.cosmos.internal.query.metrics; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/QueryMetricsWriter.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/QueryMetricsWriter.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/QueryMetricsWriter.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/QueryMetricsWriter.java index cec9e600d50a..24021b91ec76 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/QueryMetricsWriter.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/QueryMetricsWriter.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.metrics; +package com.azure.cosmos.internal.query.metrics; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.internal.QueryMetrics; -import com.azure.data.cosmos.internal.QueryPreparationTimes; -import com.azure.data.cosmos.internal.RuntimeExecutionTimes; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.internal.QueryMetrics; +import com.azure.cosmos.internal.QueryPreparationTimes; +import com.azure.cosmos.internal.RuntimeExecutionTimes; import org.apache.commons.lang3.tuple.ImmutablePair; import java.time.Duration; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/SchedulingStopwatch.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/SchedulingStopwatch.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/SchedulingStopwatch.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/SchedulingStopwatch.java index 506d8bbd622d..c5ef10e33a1a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/SchedulingStopwatch.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/SchedulingStopwatch.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.metrics; +package com.azure.cosmos.internal.query.metrics; import org.apache.commons.lang3.time.StopWatch; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/SchedulingTimeSpan.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/SchedulingTimeSpan.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/SchedulingTimeSpan.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/SchedulingTimeSpan.java index 1a03ebaf8c48..698884496bb3 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/SchedulingTimeSpan.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/SchedulingTimeSpan.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.metrics; +package com.azure.cosmos.internal.query.metrics; public class SchedulingTimeSpan { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/TextTable.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/TextTable.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/TextTable.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/TextTable.java index ecf07837a5d7..1847b7ca7b5c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/metrics/TextTable.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/metrics/TextTable.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.metrics; +package com.azure.cosmos.internal.query.metrics; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/orderbyquery/OrderByRowResult.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/orderbyquery/OrderByRowResult.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/orderbyquery/OrderByRowResult.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/orderbyquery/OrderByRowResult.java index 4f3c0df07ce4..c2116c46c031 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/orderbyquery/OrderByRowResult.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/orderbyquery/OrderByRowResult.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.orderbyquery; +package com.azure.cosmos.internal.query.orderbyquery; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.query.QueryItem; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.query.QueryItem; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/orderbyquery/OrderbyRowComparer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/orderbyquery/OrderbyRowComparer.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/orderbyquery/OrderbyRowComparer.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/orderbyquery/OrderbyRowComparer.java index 3f8c7db66cfc..42d18d4249c3 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/orderbyquery/OrderbyRowComparer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/query/orderbyquery/OrderbyRowComparer.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query.orderbyquery; +package com.azure.cosmos.internal.query.orderbyquery; -import com.azure.data.cosmos.internal.query.ItemComparator; -import com.azure.data.cosmos.internal.query.ItemType; -import com.azure.data.cosmos.internal.query.ItemTypeHelper; -import com.azure.data.cosmos.internal.query.QueryItem; -import com.azure.data.cosmos.internal.query.SortOrder; +import com.azure.cosmos.internal.query.ItemComparator; +import com.azure.cosmos.internal.query.ItemType; +import com.azure.cosmos.internal.query.ItemTypeHelper; +import com.azure.cosmos.internal.query.QueryItem; +import com.azure.cosmos.internal.query.SortOrder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/BoolPartitionKeyComponent.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/BoolPartitionKeyComponent.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/BoolPartitionKeyComponent.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/BoolPartitionKeyComponent.java index aec2d0a7a27b..a20a051fb65b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/BoolPartitionKeyComponent.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/BoolPartitionKeyComponent.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.Utils; import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/CaseInsensitiveHashMap.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/CaseInsensitiveHashMap.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/CaseInsensitiveHashMap.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/CaseInsensitiveHashMap.java index b1571f728380..5db64108605e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/CaseInsensitiveHashMap.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/CaseInsensitiveHashMap.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; import java.util.HashMap; import java.util.Map; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/CollectionRoutingMap.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/CollectionRoutingMap.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/CollectionRoutingMap.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/CollectionRoutingMap.java index 64d104292d69..cac915700ce8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/CollectionRoutingMap.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/CollectionRoutingMap.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.PartitionKeyRange; import org.apache.commons.lang3.tuple.ImmutablePair; import java.util.Collection; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/IPartitionKeyComponent.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/IPartitionKeyComponent.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/IPartitionKeyComponent.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/IPartitionKeyComponent.java index 54abde3e27a6..f88e97f7859d 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/IPartitionKeyComponent.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/IPartitionKeyComponent.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/IServerIdentity.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/IServerIdentity.java similarity index 73% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/IServerIdentity.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/IServerIdentity.java index 9c4af58e1f1a..e909fc07426f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/IServerIdentity.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/IServerIdentity.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; public interface IServerIdentity { } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/InMemoryCollectionRoutingMap.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/InMemoryCollectionRoutingMap.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/InMemoryCollectionRoutingMap.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/InMemoryCollectionRoutingMap.java index f8e1137f407e..c516bfc349f9 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/InMemoryCollectionRoutingMap.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/InMemoryCollectionRoutingMap.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.PartitionKeyRange; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/InfinityPartitionKeyComponent.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/InfinityPartitionKeyComponent.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/InfinityPartitionKeyComponent.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/InfinityPartitionKeyComponent.java index f9d295d29f4e..547240736dbb 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/InfinityPartitionKeyComponent.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/InfinityPartitionKeyComponent.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.Utils; import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/Int128.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/Int128.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/Int128.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/Int128.java index c9be49e75d2b..a4297f13e8ac 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/Int128.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/Int128.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; import java.math.BigInteger; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/LocationCache.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/LocationCache.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/LocationCache.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/LocationCache.java index bcaac3877ba7..d4f4064e4cbd 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/LocationCache.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/LocationCache.java @@ -1,16 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.DatabaseAccount; -import com.azure.data.cosmos.DatabaseAccountLocation; -import com.azure.data.cosmos.internal.Configs; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.Utils; +package com.azure.cosmos.internal.routing; + +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.DatabaseAccount; +import com.azure.cosmos.DatabaseAccountLocation; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.Utils; import org.apache.commons.collections4.list.UnmodifiableList; import org.apache.commons.collections4.map.CaseInsensitiveMap; import org.apache.commons.collections4.map.UnmodifiableMap; @@ -466,7 +467,7 @@ public boolean canUseMultipleWriteLocations(RxDocumentServiceRequest request) { return this.canUseMultipleWriteLocations() && (request.getResourceType() == ResourceType.Document || (request.getResourceType() == ResourceType.StoredProcedure && request.getOperationType() == - com.azure.data.cosmos.internal.OperationType.ExecuteJavaScript)); + com.azure.cosmos.internal.OperationType.ExecuteJavaScript)); } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/LocationHelper.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/LocationHelper.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/LocationHelper.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/LocationHelper.java index 07d14e513471..e4bad512e98c 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/LocationHelper.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/LocationHelper.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MaxNumberPartitionKeyComponent.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MaxNumberPartitionKeyComponent.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MaxNumberPartitionKeyComponent.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MaxNumberPartitionKeyComponent.java index a4a941b60196..cf088c21414b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MaxNumberPartitionKeyComponent.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MaxNumberPartitionKeyComponent.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.Utils; import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MaxStringPartitionKeyComponent.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MaxStringPartitionKeyComponent.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MaxStringPartitionKeyComponent.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MaxStringPartitionKeyComponent.java index 3073f2af8c16..5243e00d9e6f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MaxStringPartitionKeyComponent.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MaxStringPartitionKeyComponent.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.Utils; import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MinNumberPartitionKeyComponent.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MinNumberPartitionKeyComponent.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MinNumberPartitionKeyComponent.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MinNumberPartitionKeyComponent.java index 5cb3924bdc74..d40d71820207 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MinNumberPartitionKeyComponent.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MinNumberPartitionKeyComponent.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.Utils; import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MinStringPartitionKeyComponent.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MinStringPartitionKeyComponent.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MinStringPartitionKeyComponent.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MinStringPartitionKeyComponent.java index 0319e1af39ef..d7bcd29f813d 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MinStringPartitionKeyComponent.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MinStringPartitionKeyComponent.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.Utils; import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MurmurHash3_128.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MurmurHash3_128.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MurmurHash3_128.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MurmurHash3_128.java index 5ca94cf4cc1a..de745395c51a 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MurmurHash3_128.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MurmurHash3_128.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; public class MurmurHash3_128 { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MurmurHash3_32.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MurmurHash3_32.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MurmurHash3_32.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MurmurHash3_32.java index 640f949c7a69..2a0c8a4224f9 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/MurmurHash3_32.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/MurmurHash3_32.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; /* * The MurmurHash3 algorithm was created by Austin Appleby and placed in the public domain. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/NullPartitionKeyComponent.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/NullPartitionKeyComponent.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/NullPartitionKeyComponent.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/NullPartitionKeyComponent.java index 75e828d23372..2e9054a72425 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/NullPartitionKeyComponent.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/NullPartitionKeyComponent.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.Utils; import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/NumberPartitionKeyComponent.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/NumberPartitionKeyComponent.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/NumberPartitionKeyComponent.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/NumberPartitionKeyComponent.java index abafed38c10c..cf06467bf0a7 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/NumberPartitionKeyComponent.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/NumberPartitionKeyComponent.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.Utils; import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/PartitionKeyAndResourceTokenPair.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/PartitionKeyAndResourceTokenPair.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/PartitionKeyAndResourceTokenPair.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/PartitionKeyAndResourceTokenPair.java index e7bac56498ca..738765826b96 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/PartitionKeyAndResourceTokenPair.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/PartitionKeyAndResourceTokenPair.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; /** * This is the pair for Partition key and its corresponding Resource Token , diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/PartitionKeyComponentType.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/PartitionKeyComponentType.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/PartitionKeyComponentType.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/PartitionKeyComponentType.java index 922747a0b79e..d8aee15208aa 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/PartitionKeyComponentType.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/PartitionKeyComponentType.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; enum PartitionKeyComponentType { UNDEFINED(0x0), diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/PartitionKeyInternal.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/PartitionKeyInternal.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/PartitionKeyInternal.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/PartitionKeyInternal.java index 54d2022cca1b..2e7a62469c01 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/PartitionKeyInternal.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/PartitionKeyInternal.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.Undefined; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.Strings; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.Undefined; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.Strings; +import com.azure.cosmos.internal.Utils; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.List; -import static com.azure.data.cosmos.internal.Utils.as; +import static com.azure.cosmos.internal.Utils.as; /** * Used internally to encapsulate internal information of a partition key in the Azure Cosmos DB database service. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/PartitionKeyInternalHelper.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/PartitionKeyInternalHelper.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/PartitionKeyInternalHelper.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/PartitionKeyInternalHelper.java index a879d5980cfb..465f5045ca3b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/PartitionKeyInternalHelper.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/PartitionKeyInternalHelper.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.CommonsBridgeInternal; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.PartitionKind; -import com.azure.data.cosmos.internal.Bytes; -import com.azure.data.cosmos.internal.RMResources; +import com.azure.cosmos.CommonsBridgeInternal; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.PartitionKind; +import com.azure.cosmos.internal.Bytes; +import com.azure.cosmos.internal.RMResources; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -16,8 +16,8 @@ public class PartitionKeyInternalHelper { - public static final String MinimumInclusiveEffectivePartitionKey = PartitionKeyInternalHelper.toHexEncodedBinaryString(PartitionKeyInternal.EmptyPartitionKey.components); - public static final String MaximumExclusiveEffectivePartitionKey = PartitionKeyInternalHelper.toHexEncodedBinaryString(PartitionKeyInternal.InfinityPartitionKey.components); + public static final String MinimumInclusiveEffectivePartitionKey = toHexEncodedBinaryString(PartitionKeyInternal.EmptyPartitionKey.components); + public static final String MaximumExclusiveEffectivePartitionKey = toHexEncodedBinaryString(PartitionKeyInternal.InfinityPartitionKey.components); static final int MaxPartitionKeyBinarySize = (1 /*type marker */ + diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/PartitionKeyRangeIdentity.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/PartitionKeyRangeIdentity.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/PartitionKeyRangeIdentity.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/PartitionKeyRangeIdentity.java index 237d7fe5c86b..a935325bdd16 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/PartitionKeyRangeIdentity.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/PartitionKeyRangeIdentity.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/Range.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/Range.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/Range.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/Range.java index d5e9ba9b0493..2e5194bfac90 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/Range.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/Range.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.JsonSerializable; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.JsonSerializable; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -170,4 +170,4 @@ public int compare(Range range1, Range range2) { return range1.isMaxInclusive() ? 1 : -1; } } -} \ No newline at end of file +} diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/RoutingMapProvider.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/RoutingMapProvider.java similarity index 85% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/RoutingMapProvider.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/RoutingMapProvider.java index 9abf11237363..c161fcc176a7 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/RoutingMapProvider.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/RoutingMapProvider.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.PartitionKeyRange; import java.util.Collection; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/RoutingMapProviderHelper.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/RoutingMapProviderHelper.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/RoutingMapProviderHelper.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/RoutingMapProviderHelper.java index 8668f4d69cdd..394eb866b960 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/RoutingMapProviderHelper.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/RoutingMapProviderHelper.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.PartitionKeyRange; import java.util.ArrayList; import java.util.Collection; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/StringPartitionKeyComponent.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/StringPartitionKeyComponent.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/StringPartitionKeyComponent.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/StringPartitionKeyComponent.java index 3a34595a3325..b8715804b5bc 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/StringPartitionKeyComponent.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/StringPartitionKeyComponent.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.Utils; import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; @@ -24,7 +24,7 @@ public StringPartitionKeyComponent(String value) { this.value = value; try { - this.utf8Value = com.azure.data.cosmos.internal.Utils.getUTF8Bytes(value); + this.utf8Value = Utils.getUTF8Bytes(value); } catch (UnsupportedEncodingException e) { throw new IllegalArgumentException(e); } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/UInt128.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/UInt128.java similarity index 82% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/UInt128.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/UInt128.java index 18670e2c9e0f..dd0a572a5d46 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/UInt128.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/UInt128.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; class UInt128 { long low; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/UndefinedPartitionKeyComponent.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/UndefinedPartitionKeyComponent.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/UndefinedPartitionKeyComponent.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/UndefinedPartitionKeyComponent.java index 2192ed0d3efa..0edbb7324424 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/internal/routing/UndefinedPartitionKeyComponent.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/routing/UndefinedPartitionKeyComponent.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.Utils; +import com.azure.cosmos.internal.Utils; import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/package-info.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/package-info.java similarity index 85% rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/package-info.java rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/package-info.java index f768df66e27e..6b28ac5b61c8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/package-info.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/package-info.java @@ -3,4 +3,4 @@ /** * This package provides Rx interfaces for interacting with Azure Cosmos DB. */ -package com.azure.data.cosmos; \ No newline at end of file +package com.azure.cosmos; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/BridgeUtils.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/BridgeUtils.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/BridgeUtils.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/BridgeUtils.java index 343baff8e539..1170882a1346 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/BridgeUtils.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/BridgeUtils.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/ClientUnderTestBuilder.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ClientUnderTestBuilder.java similarity index 82% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/ClientUnderTestBuilder.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ClientUnderTestBuilder.java index 2058135de74f..30b8d28ea2fb 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/ClientUnderTestBuilder.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ClientUnderTestBuilder.java @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.RxDocumentClientUnderTest; -import com.azure.data.cosmos.internal.directconnectivity.ReflectionUtils; +import com.azure.cosmos.internal.RxDocumentClientUnderTest; +import com.azure.cosmos.internal.directconnectivity.ReflectionUtils; +import com.azure.cosmos.internal.RxDocumentClientUnderTest; +import com.azure.cosmos.internal.directconnectivity.ReflectionUtils; import java.net.URI; import java.net.URISyntaxException; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/ConflictTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ConflictTests.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/ConflictTests.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ConflictTests.java index 3c8099ff3921..f4cf0d228b15 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/ConflictTests.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ConflictTests.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Conflict; -import com.azure.data.cosmos.internal.Document; +import com.azure.cosmos.internal.Conflict; +import com.azure.cosmos.internal.Document; import org.apache.commons.io.IOUtils; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/ConnectionPolicyTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ConnectionPolicyTest.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/ConnectionPolicyTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ConnectionPolicyTest.java index aa4b682f46b7..ee1d822bf559 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/ConnectionPolicyTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ConnectionPolicyTest.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.directconnectivity.Protocol; +import com.azure.cosmos.internal.directconnectivity.Protocol; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosAsyncClientTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosAsyncClientTest.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosAsyncClientTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosAsyncClientTest.java index a812433b251c..c68e29f0e608 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosAsyncClientTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosAsyncClientTest.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import com.google.common.base.Strings; import org.testng.ITest; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosClientExceptionTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosClientExceptionTest.java similarity index 78% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosClientExceptionTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosClientExceptionTest.java index 6b354f916dc0..07a64a18ece1 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosClientExceptionTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosClientExceptionTest.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.http.HttpHeaders; import com.google.common.collect.ImmutableMap; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -12,21 +12,21 @@ import java.lang.reflect.InvocationTargetException; import java.util.Map; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.BADREQUEST; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.CONFLICT; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.FORBIDDEN; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.GONE; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.INTERNAL_SERVER_ERROR; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.LOCKED; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.METHOD_NOT_ALLOWED; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.NOTFOUND; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.PRECONDITION_FAILED; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.REQUEST_ENTITY_TOO_LARGE; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.REQUEST_TIMEOUT; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.RETRY_WITH; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.SERVICE_UNAVAILABLE; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.TOO_MANY_REQUESTS; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.UNAUTHORIZED; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.BADREQUEST; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.CONFLICT; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.FORBIDDEN; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.GONE; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.INTERNAL_SERVER_ERROR; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.LOCKED; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.METHOD_NOT_ALLOWED; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.NOTFOUND; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.PRECONDITION_FAILED; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.REQUEST_ENTITY_TOO_LARGE; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.REQUEST_TIMEOUT; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.RETRY_WITH; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.SERVICE_UNAVAILABLE; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.TOO_MANY_REQUESTS; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.UNAUTHORIZED; import static com.google.common.base.Strings.lenientFormat; import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosContainerTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosContainerTest.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosContainerTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosContainerTest.java index 67d128cd6248..0bdfc7ee8b45 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosContainerTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosContainerTest.java @@ -4,10 +4,11 @@ * */ -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.rx.TestSuiteBase; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosDatabaseForTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosDatabaseForTest.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosDatabaseForTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosDatabaseForTest.java index 36997bfbd51b..3996ad0578ad 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosDatabaseForTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosDatabaseForTest.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosDatabaseTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosDatabaseTest.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosDatabaseTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosDatabaseTest.java index 9e335a0671ff..60f670c05918 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosDatabaseTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosDatabaseTest.java @@ -4,10 +4,11 @@ * */ -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.rx.TestSuiteBase; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosItemTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosItemTest.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosItemTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosItemTest.java index 58adf4b568f2..d49772b60400 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosItemTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosItemTest.java @@ -4,10 +4,11 @@ * */ -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.rx.TestSuiteBase; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosKeyCredentialTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosKeyCredentialTest.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosKeyCredentialTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosKeyCredentialTest.java index d8d34dc83799..bf9c549dcdb4 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosKeyCredentialTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosKeyCredentialTest.java @@ -1,8 +1,10 @@ -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.FailureValidator; -import com.azure.data.cosmos.internal.TestConfigurations; -import com.azure.data.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.TestConfigurations; +import com.azure.cosmos.rx.TestSuiteBase; import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosPartitionKeyTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosPartitionKeyTests.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosPartitionKeyTests.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosPartitionKeyTests.java index 57a0fad73eaf..1a9c7a1eb294 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosPartitionKeyTests.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosPartitionKeyTests.java @@ -1,19 +1,31 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; - -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.http.HttpClientConfig; -import com.azure.data.cosmos.internal.http.HttpHeaders; -import com.azure.data.cosmos.internal.http.HttpRequest; -import com.azure.data.cosmos.rx.TestSuiteBase; +package com.azure.cosmos; + +import com.azure.cosmos.internal.BaseAuthorizationTokenProvider; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.TestConfigurations; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpClientConfig; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.rx.TestSuiteBase; import io.netty.handler.codec.http.HttpMethod; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosResponseValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseValidator.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosResponseValidator.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseValidator.java index d64fa544c66e..cefed5a6f9a2 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosResponseValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseValidator.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; + +import org.assertj.core.api.Assertions; import java.util.ArrayList; import java.util.Collection; @@ -170,7 +172,7 @@ public void validate(CosmosAsyncContainerResponse resourceResponse) { } for (Entry> entry : readIndexMap.entrySet()) { - assertThat(entry.getValue()) + Assertions.assertThat(entry.getValue()) .containsExactlyInAnyOrderElementsOf(writtenIndexMap.get(entry.getKey())); } } diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosSyncStoredProcTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosSyncStoredProcTest.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosSyncStoredProcTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosSyncStoredProcTest.java index e07413e97d18..994091683ce5 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosSyncStoredProcTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosSyncStoredProcTest.java @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.rx.TestSuiteBase; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosSyncUDFTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosSyncUDFTest.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosSyncUDFTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosSyncUDFTest.java index f8f1f9857bbc..3aa1c716bdaa 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosSyncUDFTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosSyncUDFTest.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.rx.TestSuiteBase; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosTriggerTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosTriggerTest.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosTriggerTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosTriggerTest.java index 97f0b6db9256..60e8d4dfa9ba 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosTriggerTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosTriggerTest.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.rx.TestSuiteBase; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosUserTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosUserTest.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosUserTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosUserTest.java index a72550240a7d..c0f6b52ddde6 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/CosmosUserTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosUserTest.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.rx.TestSuiteBase; +import com.azure.cosmos.rx.TestSuiteBase; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/DocumentClientTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/DocumentClientTest.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/DocumentClientTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/DocumentClientTest.java index fc41a3ac6333..6df0255489d0 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/DocumentClientTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/DocumentClientTest.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.AsyncDocumentClient; import com.google.common.base.Strings; import org.testng.ITest; import org.testng.annotations.AfterMethod; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/DocumentCollectionTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/DocumentCollectionTests.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/DocumentCollectionTests.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/DocumentCollectionTests.java index faa43012590b..8b4efb2e4ee8 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/DocumentCollectionTests.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/DocumentCollectionTests.java @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.DocumentCollection; import com.google.common.collect.ImmutableList; +import org.assertj.core.api.Assertions; import org.testng.annotations.Test; import java.util.ArrayList; @@ -52,6 +53,6 @@ public void indexingPolicy_serializeAndDeserialize() { IndexingPolicy indexingPolicyPostSerialization = documentCollectionPostSerialization.getIndexingPolicy(); assertThat(indexingPolicyPostSerialization).isNotNull(); List spatialSpecListPostSerialization = indexingPolicyPostSerialization.getSpatialIndexes(); - assertThat(spatialSpecListPostSerialization).isNotNull(); + Assertions.assertThat(spatialSpecListPostSerialization).isNotNull(); } } diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/DocumentTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/DocumentTests.java similarity index 79% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/DocumentTests.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/DocumentTests.java index 81a7508222cc..fcc1129cd7ba 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/DocumentTests.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/DocumentTests.java @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Document; +import com.azure.cosmos.internal.Document; import org.testng.annotations.Test; import java.time.OffsetDateTime; import java.time.ZoneOffset; -import static com.azure.data.cosmos.BridgeInternal.setTimestamp; +import static com.azure.cosmos.BridgeInternal.setTimestamp; import static org.assertj.core.api.Assertions.assertThat; public class DocumentTests { diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/GatewayTestUtils.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/GatewayTestUtils.java similarity index 77% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/GatewayTestUtils.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/GatewayTestUtils.java index 55a434887745..cc2ba3716724 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/GatewayTestUtils.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/GatewayTestUtils.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.PartitionKeyRange; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/IncludedPathTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/IncludedPathTest.java similarity index 72% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/IncludedPathTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/IncludedPathTest.java index 685f86cc3f07..e1696066dcbc 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/IncludedPathTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/IncludedPathTest.java @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; +import org.assertj.core.api.Assertions; import org.testng.annotations.Test; import java.util.Collection; @@ -29,8 +30,8 @@ public void deserialize() { "}"; IncludedPath path = new IncludedPath(json); Collection indexes = path.getIndexes(); - assertThat(indexes).hasSize(2); - assertThat(indexes).usingFieldByFieldElementComparator().contains(Index.Range(DataType.STRING, -1)); - assertThat(indexes).usingFieldByFieldElementComparator().contains(Index.Range(DataType.NUMBER, -1)); + Assertions.assertThat(indexes).hasSize(2); + Assertions.assertThat(indexes).usingFieldByFieldElementComparator().contains(Index.Range(DataType.STRING, -1)); + Assertions.assertThat(indexes).usingFieldByFieldElementComparator().contains(Index.Range(DataType.NUMBER, -1)); } } diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/JsonSerializableTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/JsonSerializableTests.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/JsonSerializableTests.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/JsonSerializableTests.java index 265a190b9d25..b73132f5def7 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/JsonSerializableTests.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/JsonSerializableTests.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Document; +import com.azure.cosmos.internal.Document; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonParseException; @@ -11,7 +11,7 @@ import java.io.Serializable; -import static com.azure.data.cosmos.BridgeInternal.setProperty; +import static com.azure.cosmos.BridgeInternal.setProperty; import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.fail; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/PartitionKeyHashingTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/PartitionKeyHashingTests.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/PartitionKeyHashingTests.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/PartitionKeyHashingTests.java index 7dd78a41a535..3d8e498b9b3f 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/PartitionKeyHashingTests.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/PartitionKeyHashingTests.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Undefined; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternalHelper; +import com.azure.cosmos.internal.Undefined; +import com.azure.cosmos.internal.routing.PartitionKeyInternalHelper; import com.fasterxml.jackson.databind.node.NullNode; import org.testng.annotations.Test; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/PermissionTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/PermissionTest.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/PermissionTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/PermissionTest.java index ae5910273dc6..800eccbc240e 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/PermissionTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/PermissionTest.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.Permission; +import com.azure.cosmos.internal.Permission; import org.testng.annotations.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/ResourceIdTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ResourceIdTests.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/ResourceIdTests.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ResourceIdTests.java index e7d776f71ac7..6275e769909d 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/ResourceIdTests.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ResourceIdTests.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos; +package com.azure.cosmos; -import com.azure.data.cosmos.internal.ResourceId; +import com.azure.cosmos.internal.ResourceId; import org.apache.commons.lang3.tuple.Pair; import org.testng.annotations.Test; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ClientRetryPolicyTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ClientRetryPolicyTest.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ClientRetryPolicyTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ClientRetryPolicyTest.java index 64ba5fe5feb4..f9913f6f879b 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ClientRetryPolicyTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ClientRetryPolicyTest.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.RetryOptions; +import com.azure.cosmos.RetryOptions; import io.netty.handler.timeout.ReadTimeoutException; import io.reactivex.subscribers.TestSubscriber; import org.mockito.Mockito; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ConfigsBuilder.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ConfigsBuilder.java similarity index 83% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ConfigsBuilder.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ConfigsBuilder.java index 68eab9c85d39..65ae5b06dc11 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ConfigsBuilder.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ConfigsBuilder.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.directconnectivity.Protocol; +import com.azure.cosmos.internal.directconnectivity.Protocol; import org.mockito.Mockito; /** diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ConfigsTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ConfigsTests.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ConfigsTests.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ConfigsTests.java index 9aa1ecd0db4a..833d447ba6db 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ConfigsTests.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ConfigsTests.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.directconnectivity.Protocol; +import com.azure.cosmos.internal.directconnectivity.Protocol; import org.testng.annotations.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ConsistencyTests1.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ConsistencyTests1.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ConsistencyTests1.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ConsistencyTests1.java index 7a93681571d9..203c873e03c1 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ConsistencyTests1.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ConsistencyTests1.java @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.PartitionKind; +package com.azure.cosmos.internal; + +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.PartitionKind; import org.testng.SkipException; import org.testng.annotations.Ignore; import org.testng.annotations.Test; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ConsistencyTests2.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ConsistencyTests2.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ConsistencyTests2.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ConsistencyTests2.java index 634a4b4c1acf..d937a4f25e3d 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ConsistencyTests2.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ConsistencyTests2.java @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.internal.directconnectivity.WFConstants; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternal; +package com.azure.cosmos.internal; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.internal.directconnectivity.WFConstants; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; import org.apache.commons.lang3.Range; import org.testng.annotations.Test; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ConsistencyTestsBase.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ConsistencyTestsBase.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ConsistencyTestsBase.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ConsistencyTestsBase.java index d2d1ddc76a69..a5994daabb33 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ConsistencyTestsBase.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ConsistencyTestsBase.java @@ -2,23 +2,24 @@ // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - -import com.azure.data.cosmos.AccessCondition; -import com.azure.data.cosmos.AccessConditionType; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.PartitionKind; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.directconnectivity.WFConstants; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternalHelper; -import com.azure.data.cosmos.internal.routing.Range; +package com.azure.cosmos.internal; + +import com.azure.cosmos.AccessCondition; +import com.azure.cosmos.AccessConditionType; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.PartitionKind; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.directconnectivity.WFConstants; +import com.azure.cosmos.internal.routing.PartitionKeyInternalHelper; +import com.azure.cosmos.internal.routing.Range; import org.apache.commons.collections4.map.UnmodifiableMap; import org.apache.commons.lang3.StringUtils; +import org.assertj.core.api.Assertions; import org.testng.SkipException; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; @@ -208,8 +209,8 @@ void validateSessionContainerAfterCollectionCreateReplace(boolean useGateway) { String globalSessionToken1 = ((SessionContainer) writeClient.getSession()).getSessionToken(coll.getSelfLink()); String globalSessionToken2 = ((SessionContainer) writeClient.getSession()).getSessionToken(BridgeInternal.getAltLink(coll)); - assertThat(globalSessionToken1.indexOf(document.getSessionToken())).isNotNegative(); - assertThat(globalSessionToken2.indexOf(document.getSessionToken())).isNotNegative(); + Assertions.assertThat(globalSessionToken1.indexOf(document.getSessionToken())).isNotNegative(); + Assertions.assertThat(globalSessionToken2.indexOf(document.getSessionToken())).isNotNegative(); } { Document document2 = new Document(); @@ -222,8 +223,8 @@ void validateSessionContainerAfterCollectionCreateReplace(boolean useGateway) { String globalSessionToken1 = ((SessionContainer) writeClient.getSession()).getSessionToken(coll.getSelfLink()); String globalSessionToken2 = ((SessionContainer) writeClient.getSession()).getSessionToken(BridgeInternal.getAltLink(coll)); - assertThat(globalSessionToken1.indexOf(document.getSessionToken())).isNotNegative(); - assertThat(globalSessionToken2.indexOf(document.getSessionToken())).isNotNegative(); + Assertions.assertThat(globalSessionToken1.indexOf(document.getSessionToken())).isNotNegative(); + Assertions.assertThat(globalSessionToken2.indexOf(document.getSessionToken())).isNotNegative(); } } finally { safeClose(writeClient); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/DocumentQuerySpyWireContentTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/DocumentQuerySpyWireContentTest.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/DocumentQuerySpyWireContentTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/DocumentQuerySpyWireContentTest.java index 404e5404ba1b..186d3bf56255 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/DocumentQuerySpyWireContentTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/DocumentQuerySpyWireContentTest.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.AsyncDocumentClient.Builder; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.internal.AsyncDocumentClient.Builder; +import com.azure.cosmos.internal.http.HttpRequest; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/DocumentServiceRequestContextValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/DocumentServiceRequestContextValidator.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/DocumentServiceRequestContextValidator.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/DocumentServiceRequestContextValidator.java index 18c67f6132b8..c7ba6d20882f 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/DocumentServiceRequestContextValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/DocumentServiceRequestContextValidator.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.directconnectivity.StoreResponse; +import com.azure.cosmos.internal.directconnectivity.StoreResponse; import java.util.ArrayList; import java.util.List; @@ -70,4 +70,4 @@ public void validate(DocumentServiceRequestContext v) { return this; } } -} \ No newline at end of file +} diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/DocumentServiceRequestValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/DocumentServiceRequestValidator.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/DocumentServiceRequestValidator.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/DocumentServiceRequestValidator.java index ad9521c534e7..3cd6040d9548 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/DocumentServiceRequestValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/DocumentServiceRequestValidator.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import java.util.ArrayList; import java.util.List; @@ -86,4 +86,4 @@ public void validate(RxDocumentServiceRequest request) { return this; } } -} \ No newline at end of file +} diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FailureValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/FailureValidator.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FailureValidator.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/FailureValidator.java index f3c809714d7a..32b3892a8fba 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FailureValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/FailureValidator.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.CosmosError; -import com.azure.data.cosmos.internal.directconnectivity.WFConstants; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosError; +import com.azure.cosmos.internal.directconnectivity.WFConstants; import java.util.ArrayList; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FeedResponseListValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/FeedResponseListValidator.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FeedResponseListValidator.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/FeedResponseListValidator.java index a3e57c03ac8b..52da0fc4f831 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FeedResponseListValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/FeedResponseListValidator.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CompositePath; -import com.azure.data.cosmos.CosmosItemProperties; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CompositePath; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; import com.fasterxml.jackson.databind.node.ArrayNode; import java.time.Duration; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FeedResponseValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/FeedResponseValidator.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FeedResponseValidator.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/FeedResponseValidator.java index 177be25c838a..8c74f4ea68c6 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FeedResponseValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/FeedResponseValidator.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; import java.util.ArrayList; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/HttpClientUnderTestWrapper.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/HttpClientUnderTestWrapper.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/HttpClientUnderTestWrapper.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/HttpClientUnderTestWrapper.java index c24396140217..3f0d005663f1 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/HttpClientUnderTestWrapper.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/HttpClientUnderTestWrapper.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpRequest; import org.mockito.Mockito; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/LocationHelperTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/LocationHelperTest.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/LocationHelperTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/LocationHelperTest.java index 95755e6a5c1c..e9baba73f310 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/LocationHelperTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/LocationHelperTest.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.routing.LocationHelper; +import com.azure.cosmos.internal.routing.LocationHelper; import org.testng.annotations.Test; import java.net.URI; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/NetworkFailureTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/NetworkFailureTest.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/NetworkFailureTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/NetworkFailureTest.java index ed01979a1f4d..f82eab306f47 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/NetworkFailureTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/NetworkFailureTest.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import org.mockito.Mockito; import org.testng.annotations.AfterClass; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ParallelAsync.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ParallelAsync.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ParallelAsync.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ParallelAsync.java index 4db9d074d9ce..687cb2713b75 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ParallelAsync.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ParallelAsync.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import org.apache.commons.lang3.Range; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/PathsHelperTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/PathsHelperTest.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/PathsHelperTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/PathsHelperTest.java index dc290dcf59fd..26c806fd0447 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/PathsHelperTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/PathsHelperTest.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import org.testng.annotations.Test; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RenameCollectionAwareClientRetryPolicyTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RenameCollectionAwareClientRetryPolicyTest.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RenameCollectionAwareClientRetryPolicyTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RenameCollectionAwareClientRetryPolicyTest.java index 7909e1625ed1..babb0176c91c 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RenameCollectionAwareClientRetryPolicyTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RenameCollectionAwareClientRetryPolicyTest.java @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BadRequestException; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.NotFoundException; -import com.azure.data.cosmos.internal.directconnectivity.WFConstants; -import com.azure.data.cosmos.internal.caches.RxClientCollectionCache; +import com.azure.cosmos.BadRequestException; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.NotFoundException; +import com.azure.cosmos.internal.caches.RxClientCollectionCache; +import com.azure.cosmos.internal.directconnectivity.WFConstants; import io.netty.handler.timeout.ReadTimeoutException; import org.mockito.Mockito; import org.testng.annotations.Test; import reactor.core.publisher.Mono; -import static com.azure.data.cosmos.internal.ClientRetryPolicyTest.validateSuccess; +import static com.azure.cosmos.internal.ClientRetryPolicyTest.validateSuccess; import static org.assertj.core.api.Assertions.assertThat; public class RenameCollectionAwareClientRetryPolicyTest { diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ResourceResponseValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ResourceResponseValidator.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ResourceResponseValidator.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ResourceResponseValidator.java index a045b7ffd5d7..11067effeb73 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ResourceResponseValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ResourceResponseValidator.java @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - -import com.azure.data.cosmos.CompositePath; -import com.azure.data.cosmos.IndexingMode; -import com.azure.data.cosmos.PermissionMode; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.SpatialSpec; -import com.azure.data.cosmos.SpatialType; -import com.azure.data.cosmos.TriggerOperation; -import com.azure.data.cosmos.TriggerType; +package com.azure.cosmos.internal; + +import com.azure.cosmos.CompositePath; +import com.azure.cosmos.IndexingMode; +import com.azure.cosmos.PermissionMode; +import com.azure.cosmos.Resource; +import com.azure.cosmos.SpatialSpec; +import com.azure.cosmos.SpatialType; +import com.azure.cosmos.TriggerOperation; +import com.azure.cosmos.TriggerType; import org.assertj.core.api.Condition; import java.time.Instant; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ResourceValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ResourceValidator.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ResourceValidator.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ResourceValidator.java index 1b379986df83..d9a1b1147f41 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ResourceValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ResourceValidator.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.Resource; +import com.azure.cosmos.Resource; import java.util.ArrayList; import java.util.List; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RetryAnalyzer.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RetryAnalyzer.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RetryAnalyzer.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RetryAnalyzer.java index 65224b0fb6b8..24d80a9caf4c 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RetryAnalyzer.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RetryAnalyzer.java @@ -2,9 +2,8 @@ // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.TestConfigurations; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.ITestResult; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RetryCreateDocumentTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RetryCreateDocumentTest.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RetryCreateDocumentTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RetryCreateDocumentTest.java index a04794697803..d66de5052589 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RetryCreateDocumentTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RetryCreateDocumentTest.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CosmosError; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosError; import com.google.common.collect.ImmutableMap; import org.mockito.Mockito; import org.mockito.stubbing.Answer; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RetryThrottleTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RetryThrottleTest.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RetryThrottleTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RetryThrottleTest.java index d55669ef6757..22ea6b54c102 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RetryThrottleTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RetryThrottleTest.java @@ -1,12 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.RetryOptions; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.RetryOptions; +import org.assertj.core.api.Assertions; import org.mockito.stubbing.Answer; import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; @@ -72,7 +73,7 @@ public void retryCreateDocumentsOnSpike() throws Exception { List> rsps = Flux.merge(Flux.fromIterable(list), 100).collectList().single().block(); System.out.println("total: " + totalCount.get()); - assertThat(rsps).hasSize(TOTAL_DOCS); + Assertions.assertThat(rsps).hasSize(TOTAL_DOCS); assertThat(successCount.get()).isEqualTo(TOTAL_DOCS); System.out.println("total count is " + totalCount.get()); } diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RetryUtilsTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RetryUtilsTest.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RetryUtilsTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RetryUtilsTest.java index 4a7ad273c7aa..44d4a9e9c55f 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RetryUtilsTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RetryUtilsTest.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.internal.directconnectivity.StoreResponse; -import com.azure.data.cosmos.internal.directconnectivity.StoreResponseValidator; -import com.azure.data.cosmos.internal.IRetryPolicy.ShouldRetryResult; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.internal.IRetryPolicy.ShouldRetryResult; +import com.azure.cosmos.internal.directconnectivity.StoreResponse; +import com.azure.cosmos.internal.directconnectivity.StoreResponseValidator; import io.reactivex.subscribers.TestSubscriber; import org.mockito.Matchers; import org.mockito.Mockito; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RxDocumentClientUnderTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RxDocumentClientUnderTest.java similarity index 84% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RxDocumentClientUnderTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RxDocumentClientUnderTest.java index 300aab9bbfd9..c724db65828a 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RxDocumentClientUnderTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RxDocumentClientUnderTest.java @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.ClientUnderTestBuilder; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosKeyCredential; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.http.HttpRequest; -import com.azure.data.cosmos.internal.http.HttpResponse; +import com.azure.cosmos.ClientUnderTestBuilder; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosKeyCredential; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.internal.http.HttpResponse; import org.mockito.Mockito; import org.mockito.stubbing.Answer; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RxDocumentServiceRequestTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RxDocumentServiceRequestTest.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RxDocumentServiceRequestTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RxDocumentServiceRequestTest.java index a30aadec89e7..3eac49944c39 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RxDocumentServiceRequestTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RxDocumentServiceRequestTest.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import org.apache.commons.collections4.map.HashedMap; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RxGatewayStoreModelTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RxGatewayStoreModelTest.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RxGatewayStoreModelTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RxGatewayStoreModelTest.java index be5d51b683be..1134a15c2a0f 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/RxGatewayStoreModelTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/RxGatewayStoreModelTest.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpRequest; import io.netty.handler.timeout.ReadTimeoutException; import io.reactivex.subscribers.TestSubscriber; import org.mockito.Mockito; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/SessionContainerTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/SessionContainerTest.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/SessionContainerTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/SessionContainerTest.java index 9876c8ae593c..0715d613a656 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/SessionContainerTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/SessionContainerTest.java @@ -1,14 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.GatewayTestUtils; +import com.azure.cosmos.GatewayTestUtils; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.FieldUtils; +import org.assertj.core.api.Assertions; import org.mockito.Mockito; import org.mockito.internal.util.collections.Sets; import org.testng.annotations.Test; @@ -94,8 +95,8 @@ public void setSessionToken_NoSessionTokenForPartitionKeyRangeId() throws Except assertThat(collectionNameToCollectionResourceId).hasSize(1); assertThat(collectionResourceIdToSessionTokens).hasSize(1); assertThat(collectionNameToCollectionResourceId.get(collectionName)).isEqualTo(collectionRidAsLong); - assertThat(collectionResourceIdToSessionTokens.get(collectionRidAsLong)).isNotNull(); - assertThat(collectionResourceIdToSessionTokens.get(collectionRidAsLong)).hasSize(1); + Assertions.assertThat(collectionResourceIdToSessionTokens.get(collectionRidAsLong)).isNotNull(); + Assertions.assertThat(collectionResourceIdToSessionTokens.get(collectionRidAsLong)).hasSize(1); assertThat(collectionResourceIdToSessionTokens.get(collectionRidAsLong).get(partitionKeyRangeId).convertToString()).isEqualTo(sessionToken); RxDocumentServiceRequest request2 = RxDocumentServiceRequest.create(OperationType.Read, ResourceType.Document, diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/SessionTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/SessionTest.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/SessionTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/SessionTest.java index 109c34b52295..5fa5351f6ce3 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/SessionTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/SessionTest.java @@ -1,22 +1,22 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.internal.http.HttpRequest; import io.netty.handler.codec.http.HttpMethod; import org.apache.commons.lang3.StringUtils; import org.testng.SkipException; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import java.io.UnsupportedEncodingException; import java.lang.reflect.Method; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/SessionTokenTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/SessionTokenTest.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/SessionTokenTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/SessionTokenTest.java index 94a39413e71b..b945d9754463 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/SessionTokenTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/SessionTokenTest.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.InternalServerErrorException; +import com.azure.cosmos.InternalServerErrorException; import org.testng.annotations.Test; -import static com.azure.data.cosmos.internal.Utils.ValueHolder; +import static com.azure.cosmos.internal.Utils.ValueHolder; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ShouldRetryValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ShouldRetryValidator.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ShouldRetryValidator.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ShouldRetryValidator.java index 57b391edce1e..e67d45c2d53f 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/ShouldRetryValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/ShouldRetryValidator.java @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - -import com.azure.data.cosmos.internal.FailureValidator; +package com.azure.cosmos.internal; import java.time.Duration; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/SpyClientBuilder.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/SpyClientBuilder.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/SpyClientBuilder.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/SpyClientBuilder.java index bc8e93eea0cf..7bf46cce0c06 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/SpyClientBuilder.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/SpyClientBuilder.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; public class SpyClientBuilder extends AsyncDocumentClient.Builder { diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/SpyClientUnderTestFactory.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/SpyClientUnderTestFactory.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/SpyClientUnderTestFactory.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/SpyClientUnderTestFactory.java index e540aa073f98..1fad50db1f95 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/SpyClientUnderTestFactory.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/SpyClientUnderTestFactory.java @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosKeyCredential; -import com.azure.data.cosmos.internal.directconnectivity.Protocol; -import com.azure.data.cosmos.internal.directconnectivity.ReflectionUtils; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.http.HttpHeaders; -import com.azure.data.cosmos.internal.http.HttpRequest; +package com.azure.cosmos.internal; + +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosKeyCredential; +import com.azure.cosmos.internal.directconnectivity.Protocol; +import com.azure.cosmos.internal.directconnectivity.ReflectionUtils; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.http.HttpRequest; import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.commons.lang3.tuple.Pair; import org.mockito.Mockito; @@ -41,7 +41,7 @@ public SpyBaseClass(URI serviceEndpoint, String masterKeyOrResourceToken, Connec public abstract void clearCapturedRequests(); protected static Configs createConfigsSpy(final Protocol protocol) { - final Configs configs = spy(new Configs()); + final Configs configs = Mockito.spy(new Configs()); doAnswer((Answer) invocation -> protocol).when(configs).getProtocol(); return configs; } @@ -80,7 +80,7 @@ RxGatewayStoreModel createRxGatewayProxy(ISessionContainer sessionContainer, globalEndpointManager, rxClient); this.requests = Collections.synchronizedList(new ArrayList<>()); - this.spyRxGatewayStoreModel = spy(this.origRxGatewayStoreModel); + this.spyRxGatewayStoreModel = Mockito.spy(this.origRxGatewayStoreModel); this.initRequestCapture(); return this.spyRxGatewayStoreModel; } diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/StoreHeaderTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/StoreHeaderTests.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/StoreHeaderTests.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/StoreHeaderTests.java index f49ecd63c2a5..24af949d2d5f 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/StoreHeaderTests.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/StoreHeaderTests.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import org.testng.Assert; import org.testng.annotations.AfterClass; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/StoreResponseBuilder.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/StoreResponseBuilder.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/StoreResponseBuilder.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/StoreResponseBuilder.java index 6a552f974859..b2a96163b5cf 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/StoreResponseBuilder.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/StoreResponseBuilder.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; -import com.azure.data.cosmos.internal.directconnectivity.StoreResponse; -import com.azure.data.cosmos.internal.directconnectivity.WFConstants; +import com.azure.cosmos.internal.directconnectivity.StoreResponse; +import com.azure.cosmos.internal.directconnectivity.WFConstants; import java.math.BigDecimal; import java.util.AbstractMap; @@ -93,4 +93,4 @@ public StoreResponseBuilder withContent(String content) { public StoreResponse build() { return new StoreResponse(status, headerEntries, content); } -} \ No newline at end of file +} diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/TestSuiteBase.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/TestSuiteBase.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/TestSuiteBase.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/TestSuiteBase.java index ff0879605155..7f76fda50138 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/TestSuiteBase.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/TestSuiteBase.java @@ -1,28 +1,28 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; - -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.AsyncDocumentClient.Builder; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.CompositePath; -import com.azure.data.cosmos.CompositePathSortOrder; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.DataType; -import com.azure.data.cosmos.DocumentClientTest; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.IncludedPath; -import com.azure.data.cosmos.Index; -import com.azure.data.cosmos.IndexingPolicy; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.RetryOptions; -import com.azure.data.cosmos.SqlQuerySpec; -import com.azure.data.cosmos.internal.directconnectivity.Protocol; +package com.azure.cosmos.internal; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CompositePath; +import com.azure.cosmos.CompositePathSortOrder; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.DataType; +import com.azure.cosmos.DocumentClientTest; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.IncludedPath; +import com.azure.cosmos.Index; +import com.azure.cosmos.IndexingPolicy; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.Resource; +import com.azure.cosmos.RetryOptions; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.AsyncDocumentClient.Builder; +import com.azure.cosmos.internal.directconnectivity.Protocol; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -32,6 +32,7 @@ import io.reactivex.subscribers.TestSubscriber; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.mockito.Mockito; import org.mockito.stubbing.Answer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,7 +51,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.spy; public class TestSuiteBase extends DocumentClientTest { @@ -944,7 +944,7 @@ static protected Builder createDirectRxDocumentClient(ConsistencyLevel consisten connectionPolicy.setUsingMultipleWriteLocations(true); } - Configs configs = spy(new Configs()); + Configs configs = Mockito.spy(new Configs()); doAnswer((Answer)invocation -> protocol).when(configs).getProtocol(); return new Builder().withServiceEndpoint(TestConfigurations.HOST) diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/TestUtils.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/TestUtils.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/TestUtils.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/TestUtils.java index b4f30a880eec..56864b62d889 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/TestUtils.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/TestUtils.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; public class TestUtils { private static final String DATABASES_PATH_SEGMENT = "dbs"; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/TimeTokenTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/TimeTokenTest.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/TimeTokenTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/TimeTokenTest.java index a83c39da384d..e5187401bb5e 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/TimeTokenTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/TimeTokenTest.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal; +package com.azure.cosmos.internal; import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeTest; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/caches/AsyncCacheTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/caches/AsyncCacheTest.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/caches/AsyncCacheTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/caches/AsyncCacheTest.java index 67ccd841d648..fe73079e9c8d 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/caches/AsyncCacheTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/caches/AsyncCacheTest.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.caches; +package com.azure.cosmos.internal.caches; import org.testng.annotations.Test; import reactor.core.publisher.Flux; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/AddressResolverTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/AddressResolverTest.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/AddressResolverTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/AddressResolverTest.java index eee73d6fded8..331c3cf70e11 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/AddressResolverTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/AddressResolverTest.java @@ -1,27 +1,27 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - - -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.PartitionKeyRangeGoneException; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.ICollectionRoutingMapCache; -import com.azure.data.cosmos.InvalidPartitionException; -import com.azure.data.cosmos.NotFoundException; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.caches.RxCollectionCache; -import com.azure.data.cosmos.internal.routing.CollectionRoutingMap; -import com.azure.data.cosmos.internal.routing.IServerIdentity; -import com.azure.data.cosmos.internal.routing.InMemoryCollectionRoutingMap; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternalHelper; -import com.azure.data.cosmos.internal.routing.PartitionKeyRangeIdentity; +package com.azure.cosmos.internal.directconnectivity; + + +import com.azure.cosmos.InvalidPartitionException; +import com.azure.cosmos.NotFoundException; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.PartitionKeyRangeGoneException; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.ICollectionRoutingMapCache; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.caches.RxCollectionCache; +import com.azure.cosmos.internal.routing.CollectionRoutingMap; +import com.azure.cosmos.internal.routing.IServerIdentity; +import com.azure.cosmos.internal.routing.InMemoryCollectionRoutingMap; +import com.azure.cosmos.internal.routing.PartitionKeyInternalHelper; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import org.apache.commons.lang3.NotImplementedException; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/AddressSelectorTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/AddressSelectorTest.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/AddressSelectorTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/AddressSelectorTest.java index 718ca6c3e6a3..bea144cab5ec 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/AddressSelectorTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/AddressSelectorTest.java @@ -1,18 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.internal.directconnectivity.AddressInformation; -import com.azure.data.cosmos.internal.directconnectivity.AddressSelector; -import com.azure.data.cosmos.internal.directconnectivity.IAddressResolver; -import com.azure.data.cosmos.internal.directconnectivity.Protocol; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.directconnectivity.AddressInformation; -import com.azure.data.cosmos.internal.directconnectivity.AddressSelector; -import com.azure.data.cosmos.internal.directconnectivity.IAddressResolver; -import com.azure.data.cosmos.internal.directconnectivity.Protocol; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.GoneException; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import com.google.common.collect.ImmutableList; import org.mockito.Matchers; import org.mockito.Mockito; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/AddressSelectorWrapper.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/AddressSelectorWrapper.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/AddressSelectorWrapper.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/AddressSelectorWrapper.java index 4a09932228c7..0393b34f97a5 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/AddressSelectorWrapper.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/AddressSelectorWrapper.java @@ -1,16 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.internal.directconnectivity.AddressInformation; -import com.azure.data.cosmos.internal.directconnectivity.AddressSelector; -import com.azure.data.cosmos.internal.directconnectivity.Protocol; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.directconnectivity.AddressInformation; -import com.azure.data.cosmos.internal.directconnectivity.AddressSelector; -import com.azure.data.cosmos.internal.directconnectivity.Protocol; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import org.apache.commons.lang3.tuple.ImmutablePair; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/AddressValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/AddressValidator.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/AddressValidator.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/AddressValidator.java index ad607a786785..2a3194c012fa 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/AddressValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/AddressValidator.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; import org.assertj.core.api.Condition; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/BarrierRequestHelperTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/BarrierRequestHelperTest.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/BarrierRequestHelperTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/BarrierRequestHelperTest.java index 709d4c6270b5..3500db01a2fb 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/BarrierRequestHelperTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/BarrierRequestHelperTest.java @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentClientImpl; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.routing.PartitionKeyRangeIdentity; -import com.azure.data.cosmos.internal.TestConfigurations; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentClientImpl; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.TestConfigurations; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ConsistencyReaderTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ConsistencyReaderTest.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ConsistencyReaderTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ConsistencyReaderTest.java index 8e6a86f61960..4c676a0782c5 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ConsistencyReaderTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ConsistencyReaderTest.java @@ -1,14 +1,27 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.ISessionContainer; -import com.azure.data.cosmos.RequestRateTooLargeException; -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.NotFoundException; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.NotFoundException; +import com.azure.cosmos.RequestRateTooLargeException; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.DocumentServiceRequestContext; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.ISessionContainer; +import com.azure.cosmos.internal.ISessionToken; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.RequestChargeTracker; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.StoreResponseBuilder; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.VectorSessionToken; import com.google.common.collect.ImmutableList; import io.reactivex.subscribers.TestSubscriber; import org.mockito.Mockito; @@ -22,7 +35,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import static com.azure.data.cosmos.internal.Utils.ValueHolder; +import static com.azure.cosmos.internal.Utils.ValueHolder; import static org.assertj.core.api.Assertions.assertThat; public class ConsistencyReaderTest { diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ConsistencyReaderUnderTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ConsistencyReaderUnderTest.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ConsistencyReaderUnderTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ConsistencyReaderUnderTest.java index 8b2510c38dcd..524ef3f5ee58 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ConsistencyReaderUnderTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ConsistencyReaderUnderTest.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.ISessionContainer; -import com.azure.data.cosmos.internal.Configs; -import com.azure.data.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.ISessionContainer; import org.mockito.Mockito; public class ConsistencyReaderUnderTest extends ConsistencyReader { diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ConsistencyWriterTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ConsistencyWriterTest.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ConsistencyWriterTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ConsistencyWriterTest.java index 79a48dd50da9..0e4d0d192ce0 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ConsistencyWriterTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ConsistencyWriterTest.java @@ -1,15 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.internal.ISessionContainer; -import com.azure.data.cosmos.PartitionKeyRangeGoneException; -import com.azure.data.cosmos.RequestTimeoutException; -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.PartitionIsMigratingException; -import com.azure.data.cosmos.PartitionKeyRangeIsSplittingException; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.PartitionIsMigratingException; +import com.azure.cosmos.PartitionKeyRangeGoneException; +import com.azure.cosmos.PartitionKeyRangeIsSplittingException; +import com.azure.cosmos.RequestTimeoutException; +import com.azure.cosmos.internal.DocumentServiceRequestContext; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.ISessionContainer; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.StoreResponseBuilder; +import com.azure.cosmos.internal.Utils; import com.google.common.collect.ImmutableList; import io.reactivex.subscribers.TestSubscriber; import org.mockito.Mockito; @@ -29,10 +34,10 @@ import java.util.concurrent.CyclicBarrier; import java.util.concurrent.TimeUnit; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.GONE; -import static com.azure.data.cosmos.internal.HttpConstants.SubStatusCodes.COMPLETING_PARTITION_MIGRATION; -import static com.azure.data.cosmos.internal.HttpConstants.SubStatusCodes.COMPLETING_SPLIT; -import static com.azure.data.cosmos.internal.HttpConstants.SubStatusCodes.PARTITION_KEY_RANGE_GONE; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.GONE; +import static com.azure.cosmos.internal.HttpConstants.SubStatusCodes.COMPLETING_PARTITION_MIGRATION; +import static com.azure.cosmos.internal.HttpConstants.SubStatusCodes.COMPLETING_SPLIT; +import static com.azure.cosmos.internal.HttpConstants.SubStatusCodes.PARTITION_KEY_RANGE_GONE; import static org.assertj.core.api.Assertions.assertThat; public class ConsistencyWriterTest { diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/DCDocumentCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/DCDocumentCrudTest.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/DCDocumentCrudTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/DCDocumentCrudTest.java index 0b0fea9ff518..9fdf470148bd 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/DCDocumentCrudTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/DCDocumentCrudTest.java @@ -1,40 +1,40 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.internal.AsyncDocumentClient.Builder; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -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.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.internal.RequestOptions; -import com.azure.data.cosmos.internal.ResourceResponse; -import com.azure.data.cosmos.internal.StoredProcedure; -import com.azure.data.cosmos.internal.StoredProcedureResponse; -import com.azure.data.cosmos.internal.Configs; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.SpyClientUnderTestFactory; -import com.azure.data.cosmos.internal.TestSuiteBase; -import com.azure.data.cosmos.internal.DocumentServiceRequestValidator; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.ResourceResponseValidator; -import com.azure.data.cosmos.internal.TestConfigurations; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.internal.AsyncDocumentClient.Builder; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.DocumentServiceRequestValidator; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.ResourceResponseValidator; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.SpyClientUnderTestFactory; +import com.azure.cosmos.internal.StoredProcedure; +import com.azure.cosmos.internal.StoredProcedureResponse; +import com.azure.cosmos.internal.TestConfigurations; +import com.azure.cosmos.internal.TestSuiteBase; import org.mockito.stubbing.Answer; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.lang.reflect.Method; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/EndpointMock.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/EndpointMock.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/EndpointMock.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/EndpointMock.java index b59d779b4c3f..c400ecbe0aa0 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/EndpointMock.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/EndpointMock.java @@ -1,13 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.StoreResponseBuilder; -import com.azure.data.cosmos.internal.directconnectivity.StoreResponse; -import com.azure.data.cosmos.internal.directconnectivity.WFConstants; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.StoreResponseBuilder; import com.google.common.collect.ImmutableList; import org.apache.commons.collections.map.HashedMap; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ExceptionBuilder.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ExceptionBuilder.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ExceptionBuilder.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ExceptionBuilder.java index 09e7ffed0145..9809c0096094 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ExceptionBuilder.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ExceptionBuilder.java @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.PartitionKeyRangeGoneException; -import com.azure.data.cosmos.InvalidPartitionException; -import com.azure.data.cosmos.PartitionIsMigratingException; -import com.azure.data.cosmos.PartitionKeyRangeIsSplittingException; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.InvalidPartitionException; +import com.azure.cosmos.PartitionIsMigratingException; +import com.azure.cosmos.PartitionKeyRangeGoneException; +import com.azure.cosmos.PartitionKeyRangeIsSplittingException; import java.util.AbstractMap; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/Function1WithCheckedException.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/Function1WithCheckedException.java similarity index 78% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/Function1WithCheckedException.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/Function1WithCheckedException.java index aa9c5a955bb5..2bdbd6eb8c77 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/Function1WithCheckedException.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/Function1WithCheckedException.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; @FunctionalInterface public interface Function1WithCheckedException{ diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/Function2WithCheckedException.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/Function2WithCheckedException.java similarity index 79% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/Function2WithCheckedException.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/Function2WithCheckedException.java index b6b4b60b6001..09b667bee60f 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/Function2WithCheckedException.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/Function2WithCheckedException.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; @FunctionalInterface public interface Function2WithCheckedException{ diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/GatewayAddressCacheTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/GatewayAddressCacheTest.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/GatewayAddressCacheTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/GatewayAddressCacheTest.java index aedf5a4128e2..b84e6208a4e9 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/GatewayAddressCacheTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/GatewayAddressCacheTest.java @@ -1,30 +1,41 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.internal.AsyncDocumentClient.Builder; -import com.azure.data.cosmos.internal.*; -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.PartitionKeyDefinition; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.http.HttpClientConfig; -import com.azure.data.cosmos.internal.routing.PartitionKeyRangeIdentity; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.AsyncDocumentClient.Builder; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.ConfigsBuilder; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.HttpClientUnderTestWrapper; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentClientImpl; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.TestConfigurations; +import com.azure.cosmos.internal.TestSuiteBase; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpClientConfig; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import io.reactivex.subscribers.TestSubscriber; +import org.assertj.core.api.AssertionsForClassTypes; import org.mockito.Matchers; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Factory; -import org.testng.annotations.Test; import org.testng.annotations.Ignore; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; import reactor.core.publisher.Mono; import java.net.URL; @@ -385,7 +396,7 @@ public Mono> answer(InvocationOnMock invocationOnMock) throws Thro .describedAs("getServerAddressesViaGatewayAsync will read addresses from gateway") .asList().hasSize(1); httpClientWrapper.capturedRequests.clear(); - assertThat(suboptimalAddresses).hasSize(ServiceConfig.SystemReplicationPolicy.MaxReplicaSetSize - 1); + AssertionsForClassTypes.assertThat(suboptimalAddresses).hasSize(ServiceConfig.SystemReplicationPolicy.MaxReplicaSetSize - 1); assertThat(fetchCounter.get()).isEqualTo(1); // no refresh, use cache @@ -394,7 +405,7 @@ public Mono> answer(InvocationOnMock invocationOnMock) throws Thro assertThat(httpClientWrapper.capturedRequests) .describedAs("getServerAddressesViaGatewayAsync will read addresses from gateway") .asList().hasSize(0); - assertThat(suboptimalAddresses).hasSize(ServiceConfig.SystemReplicationPolicy.MaxReplicaSetSize - 1); + AssertionsForClassTypes.assertThat(suboptimalAddresses).hasSize(ServiceConfig.SystemReplicationPolicy.MaxReplicaSetSize - 1); assertThat(fetchCounter.get()).isEqualTo(1); // wait for refresh time @@ -402,7 +413,7 @@ public Mono> answer(InvocationOnMock invocationOnMock) throws Thro addressesInfosFromCacheObs = spyCache.tryGetAddresses(req, partitionKeyRangeIdentity, false); AddressInformation[] addresses = getSuccessResult(addressesInfosFromCacheObs, TIMEOUT); - assertThat(addresses).hasSize(ServiceConfig.SystemReplicationPolicy.MaxReplicaSetSize); + AssertionsForClassTypes.assertThat(addresses).hasSize(ServiceConfig.SystemReplicationPolicy.MaxReplicaSetSize); assertThat(httpClientWrapper.capturedRequests) .describedAs("getServerAddressesViaGatewayAsync will read addresses from gateway") .asList().hasSize(1); @@ -713,7 +724,7 @@ public Mono> answer(InvocationOnMock invocationOnMock) throws Thro .block(); assertThat(getMasterAddressesViaGatewayAsyncInvocation.get()).isEqualTo(1); - assertThat(subOptimalAddresses).hasSize(ServiceConfig.SystemReplicationPolicy.MaxReplicaSetSize - 1); + AssertionsForClassTypes.assertThat(subOptimalAddresses).hasSize(ServiceConfig.SystemReplicationPolicy.MaxReplicaSetSize - 1); Instant start = Instant.now(); TimeUnit.SECONDS.sleep(refreshPeriodInSeconds + 1); @@ -732,7 +743,7 @@ public Mono> answer(InvocationOnMock invocationOnMock) throws Thro // the cache address is used. no new http request is sent assertThat(clientWrapper.capturedRequests).asList().hasSize(1); assertThat(getMasterAddressesViaGatewayAsyncInvocation.get()).isEqualTo(2); - assertThat(actualAddresses).hasSize(ServiceConfig.SystemReplicationPolicy.MaxReplicaSetSize); + AssertionsForClassTypes.assertThat(actualAddresses).hasSize(ServiceConfig.SystemReplicationPolicy.MaxReplicaSetSize); List

fetchedAddresses = origCache.getMasterAddressesViaGatewayAsync(req, ResourceType.Database, null, "/dbs/", false, false, null).block(); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/GatewayServiceConfigurationReaderTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/GatewayServiceConfigurationReaderTest.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/GatewayServiceConfigurationReaderTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/GatewayServiceConfigurationReaderTest.java index bb1c60361a14..efc9bf823655 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/GatewayServiceConfigurationReaderTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/GatewayServiceConfigurationReaderTest.java @@ -1,22 +1,22 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.CosmosKeyCredential; -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.internal.AsyncDocumentClient.Builder; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.DatabaseAccount; -import com.azure.data.cosmos.internal.BaseAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.SpyClientUnderTestFactory; -import com.azure.data.cosmos.internal.TestSuiteBase; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.http.HttpHeaders; -import com.azure.data.cosmos.internal.http.HttpRequest; -import com.azure.data.cosmos.internal.http.HttpResponse; -import com.azure.data.cosmos.internal.TestConfigurations; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.CosmosKeyCredential; +import com.azure.cosmos.DatabaseAccount; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.AsyncDocumentClient.Builder; +import com.azure.cosmos.internal.BaseAuthorizationTokenProvider; +import com.azure.cosmos.internal.SpyClientUnderTestFactory; +import com.azure.cosmos.internal.TestConfigurations; +import com.azure.cosmos.internal.TestSuiteBase; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.internal.http.HttpResponse; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.ByteBufUtil; import io.reactivex.subscribers.TestSubscriber; @@ -30,7 +30,6 @@ import reactor.core.publisher.Mono; import java.net.URI; -import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeUnit; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/GatewayServiceConfiguratorReaderMock.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/GatewayServiceConfiguratorReaderMock.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/GatewayServiceConfiguratorReaderMock.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/GatewayServiceConfiguratorReaderMock.java index ae176b13a990..f15279de7c54 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/GatewayServiceConfiguratorReaderMock.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/GatewayServiceConfiguratorReaderMock.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.DatabaseAccount; -import com.azure.data.cosmos.internal.ReplicationPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.DatabaseAccount; +import com.azure.cosmos.internal.ReplicationPolicy; import org.mockito.Mockito; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/GlobalAddressResolverTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/GlobalAddressResolverTest.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/GlobalAddressResolverTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/GlobalAddressResolverTest.java index d58ae9be1aea..4407715593b0 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/GlobalAddressResolverTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/GlobalAddressResolverTest.java @@ -1,24 +1,24 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - - -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.GlobalEndpointManager; -import com.azure.data.cosmos.internal.IAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.UserAgentContainer; -import com.azure.data.cosmos.internal.caches.RxCollectionCache; -import com.azure.data.cosmos.internal.caches.RxPartitionKeyRangeCache; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.routing.CollectionRoutingMap; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternalHelper; -import com.azure.data.cosmos.internal.routing.PartitionKeyRangeIdentity; +package com.azure.cosmos.internal.directconnectivity; + + +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.GlobalEndpointManager; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.UserAgentContainer; +import com.azure.cosmos.internal.caches.RxCollectionCache; +import com.azure.cosmos.internal.caches.RxPartitionKeyRangeCache; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.routing.CollectionRoutingMap; +import com.azure.cosmos.internal.routing.PartitionKeyInternalHelper; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; import org.apache.commons.collections4.list.UnmodifiableList; import org.mockito.Matchers; import org.mockito.Mockito; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/GoneAndRetryWithRetryPolicyTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/GoneAndRetryWithRetryPolicyTest.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/GoneAndRetryWithRetryPolicyTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/GoneAndRetryWithRetryPolicyTest.java index f65cd5cf9b73..2f5977c218c1 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/GoneAndRetryWithRetryPolicyTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/GoneAndRetryWithRetryPolicyTest.java @@ -1,19 +1,19 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.BadRequestException; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IRetryPolicy; -import com.azure.data.cosmos.InvalidPartitionException; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.PartitionIsMigratingException; -import com.azure.data.cosmos.PartitionKeyRangeIsSplittingException; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BadRequestException; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.InvalidPartitionException; +import com.azure.cosmos.PartitionIsMigratingException; +import com.azure.cosmos.PartitionKeyRangeIsSplittingException; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IRetryPolicy; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import org.testng.annotations.Test; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/HttpClientMockWrapper.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/HttpClientMockWrapper.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/HttpClientMockWrapper.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/HttpClientMockWrapper.java index f86b2207c251..eb8307d3356d 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/HttpClientMockWrapper.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/HttpClientMockWrapper.java @@ -1,19 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.http.HttpHeaders; -import com.azure.data.cosmos.internal.http.HttpRequest; -import com.azure.data.cosmos.internal.http.HttpResponse; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.internal.http.HttpResponse; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.ByteBufUtil; import org.mockito.Mockito; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.ArrayList; import java.util.Collections; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/HttpTransportClientTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/HttpTransportClientTest.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/HttpTransportClientTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/HttpTransportClientTest.java index 6b0d3707e3dc..775a3d314444 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/HttpTransportClientTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/HttpTransportClientTest.java @@ -1,38 +1,38 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.BadRequestException; -import com.azure.data.cosmos.ConflictException; -import com.azure.data.cosmos.ForbiddenException; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.InternalServerErrorException; -import com.azure.data.cosmos.InvalidPartitionException; -import com.azure.data.cosmos.LockedException; -import com.azure.data.cosmos.MethodNotAllowedException; -import com.azure.data.cosmos.NotFoundException; -import com.azure.data.cosmos.PartitionIsMigratingException; -import com.azure.data.cosmos.PartitionKeyRangeGoneException; -import com.azure.data.cosmos.PartitionKeyRangeIsSplittingException; -import com.azure.data.cosmos.PreconditionFailedException; -import com.azure.data.cosmos.RequestEntityTooLargeException; -import com.azure.data.cosmos.RequestRateTooLargeException; -import com.azure.data.cosmos.RequestTimeoutException; -import com.azure.data.cosmos.RetryWithException; -import com.azure.data.cosmos.ServiceUnavailableException; -import com.azure.data.cosmos.UnauthorizedException; -import com.azure.data.cosmos.internal.Configs; -import com.azure.data.cosmos.internal.FailureValidator; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.UserAgentContainer; -import com.azure.data.cosmos.internal.http.HttpClient; -import com.azure.data.cosmos.internal.http.HttpHeaders; -import com.azure.data.cosmos.internal.http.HttpRequest; -import com.azure.data.cosmos.internal.http.HttpResponse; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BadRequestException; +import com.azure.cosmos.ConflictException; +import com.azure.cosmos.ForbiddenException; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.InternalServerErrorException; +import com.azure.cosmos.InvalidPartitionException; +import com.azure.cosmos.LockedException; +import com.azure.cosmos.MethodNotAllowedException; +import com.azure.cosmos.NotFoundException; +import com.azure.cosmos.PartitionIsMigratingException; +import com.azure.cosmos.PartitionKeyRangeGoneException; +import com.azure.cosmos.PartitionKeyRangeIsSplittingException; +import com.azure.cosmos.PreconditionFailedException; +import com.azure.cosmos.RequestEntityTooLargeException; +import com.azure.cosmos.RequestRateTooLargeException; +import com.azure.cosmos.RequestTimeoutException; +import com.azure.cosmos.RetryWithException; +import com.azure.cosmos.ServiceUnavailableException; +import com.azure.cosmos.UnauthorizedException; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.UserAgentContainer; +import com.azure.cosmos.internal.http.HttpClient; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.http.HttpRequest; +import com.azure.cosmos.internal.http.HttpResponse; import io.netty.channel.ConnectTimeoutException; import io.reactivex.subscribers.TestSubscriber; import org.assertj.core.api.Assertions; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/HttpUtilsTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/HttpUtilsTest.java similarity index 83% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/HttpUtilsTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/HttpUtilsTest.java index 01c9af258813..d90432a59c82 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/HttpUtilsTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/HttpUtilsTest.java @@ -1,12 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.directconnectivity.HttpUtils; -import com.azure.data.cosmos.internal.http.HttpHeaders; -import com.azure.data.cosmos.internal.http.HttpResponse; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.http.HttpHeaders; +import com.azure.cosmos.internal.http.HttpResponse; import org.mockito.Mockito; import org.testng.annotations.Test; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/MultiStoreResultValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/MultiStoreResultValidator.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/MultiStoreResultValidator.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/MultiStoreResultValidator.java index 61fff874e53a..8682ae7b4999 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/MultiStoreResultValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/MultiStoreResultValidator.java @@ -1,12 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.FailureValidator; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.FailureValidator; import com.google.common.base.Predicates; import org.apache.commons.lang3.mutable.MutableObject; +import org.assertj.core.api.Assertions; import org.assertj.core.description.Description; import org.assertj.core.description.TextDescription; @@ -147,7 +148,7 @@ public Builder withSize(int expectedNumber) { @Override public void validate(List storeResults) { - assertThat(storeResults).hasSize(expectedNumber); + Assertions.assertThat(storeResults).hasSize(expectedNumber); } }); return this; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/MurmurHash3_32Test.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/MurmurHash3_32Test.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/MurmurHash3_32Test.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/MurmurHash3_32Test.java index 3378548cc85c..53ef10cf46f0 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/MurmurHash3_32Test.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/MurmurHash3_32Test.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.routing.MurmurHash3_32; +import com.azure.cosmos.internal.routing.MurmurHash3_32; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; import org.apache.commons.lang3.RandomUtils; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/PartitionKeyInternalTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/PartitionKeyInternalTest.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/PartitionKeyInternalTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/PartitionKeyInternalTest.java index 5d170c91ca59..3b0e3e37be44 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/PartitionKeyInternalTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/PartitionKeyInternalTest.java @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.CommonsBridgeInternal; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.PartitionKind; -import com.azure.data.cosmos.internal.Undefined; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternal; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternalHelper; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternalUtils; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.CommonsBridgeInternal; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.PartitionKind; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.Undefined; +import com.azure.cosmos.internal.routing.PartitionKeyInternal; +import com.azure.cosmos.internal.routing.PartitionKeyInternalHelper; +import com.azure.cosmos.internal.routing.PartitionKeyInternalUtils; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import org.testng.annotations.DataProvider; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/PartitionKeyTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/PartitionKeyTest.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/PartitionKeyTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/PartitionKeyTest.java index 38fa914e5dd5..7dbf91ffd992 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/PartitionKeyTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/PartitionKeyTest.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.internal.Undefined; -import com.azure.data.cosmos.internal.RMResources; -import com.azure.data.cosmos.internal.routing.PartitionKeyInternalHelper; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.internal.RMResources; +import com.azure.cosmos.internal.Undefined; +import com.azure.cosmos.internal.routing.PartitionKeyInternalHelper; import com.google.common.collect.ImmutableList; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/PartitionReplicasAddressesValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/PartitionReplicasAddressesValidator.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/PartitionReplicasAddressesValidator.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/PartitionReplicasAddressesValidator.java index 7c40019ab645..2c9b73bd16f0 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/PartitionReplicasAddressesValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/PartitionReplicasAddressesValidator.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; + +import org.assertj.core.api.Assertions; import java.util.ArrayList; import java.util.Collection; @@ -37,7 +39,7 @@ public Builder size(final int expectedCount) { validators.add(new PartitionReplicasAddressesValidator() { @Override public void validate(Collection
addresses) { - assertThat(addresses).hasSize(expectedCount); + Assertions.assertThat(addresses).hasSize(expectedCount); } }); return this; @@ -74,7 +76,7 @@ public Builder replicasOfPartition(String partitionKeyRangeId) { public void validate(Collection
addresses) { // if running against prod due to upgrade etc, we may have occasionally 3 or 4 replicas. - assertThat(addresses).size().isGreaterThanOrEqualTo(MAX_REPLICA_SIZE - 1).isLessThanOrEqualTo(MAX_REPLICA_SIZE); + Assertions.assertThat(addresses).size().isGreaterThanOrEqualTo(MAX_REPLICA_SIZE - 1).isLessThanOrEqualTo(MAX_REPLICA_SIZE); assertThat(addresses.stream().filter(a -> a.IsPrimary()).count()).isEqualTo(1); Address a = addresses.iterator().next(); @@ -98,7 +100,7 @@ public Builder replicasOfSamePartition() { public void validate(Collection
addresses) { // if running against prod due to upgrade etc, we may have occasionally 3 or 4 replicas. - assertThat(addresses).size().isGreaterThanOrEqualTo(MAX_REPLICA_SIZE - 1).isLessThanOrEqualTo(MAX_REPLICA_SIZE); + Assertions.assertThat(addresses).size().isGreaterThanOrEqualTo(MAX_REPLICA_SIZE - 1).isLessThanOrEqualTo(MAX_REPLICA_SIZE); assertThat(addresses.stream().filter(a -> a.IsPrimary()).count()).isEqualTo(1); Address a = addresses.iterator().next(); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/QuorumReaderTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/QuorumReaderTest.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/QuorumReaderTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/QuorumReaderTest.java index a4b034a252cc..437b492c5e02 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/QuorumReaderTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/QuorumReaderTest.java @@ -1,10 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.internal.ISessionContainer; -import com.azure.data.cosmos.internal.*; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.DocumentServiceRequestContext; +import com.azure.cosmos.internal.DocumentServiceRequestContextValidator; +import com.azure.cosmos.internal.DocumentServiceRequestValidator; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.ISessionContainer; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.RequestChargeTracker; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.StoreResponseBuilder; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableList; import io.reactivex.subscribers.TestSubscriber; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ReflectionUtils.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ReflectionUtils.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ReflectionUtils.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ReflectionUtils.java index a6c9fee31d4f..df29b2ec28f3 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ReflectionUtils.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ReflectionUtils.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.internal.RxDocumentClientImpl; -import com.azure.data.cosmos.internal.http.HttpClient; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.RxDocumentClientImpl; +import com.azure.cosmos.internal.http.HttpClient; import org.apache.commons.lang3.reflect.FieldUtils; /** diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ReplicaAddressFactory.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ReplicaAddressFactory.java similarity index 85% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ReplicaAddressFactory.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ReplicaAddressFactory.java index 95c7584d7093..fb8734704784 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ReplicaAddressFactory.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ReplicaAddressFactory.java @@ -1,12 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.directconnectivity.AddressInformation; -import com.azure.data.cosmos.internal.directconnectivity.Protocol; -import com.azure.data.cosmos.internal.directconnectivity.AddressInformation; -import com.azure.data.cosmos.internal.directconnectivity.Protocol; import org.apache.commons.lang3.RandomStringUtils; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ReplicatedResourceClientPartitionSplitTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ReplicatedResourceClientPartitionSplitTest.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ReplicatedResourceClientPartitionSplitTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ReplicatedResourceClientPartitionSplitTest.java index 1bf5839039aa..90f16e6dcda9 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ReplicatedResourceClientPartitionSplitTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ReplicatedResourceClientPartitionSplitTest.java @@ -1,13 +1,23 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.PartitionKeyRangeIsSplittingException; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.PartitionKeyRangeIsSplittingException; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.DocumentServiceRequestContext; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.SessionContainer; +import com.azure.cosmos.internal.StoreResponseBuilder; import io.reactivex.subscribers.TestSubscriber; import org.assertj.core.api.Assertions; import org.mockito.Mockito; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ReplicatedResourceClientTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ReplicatedResourceClientTest.java similarity index 83% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ReplicatedResourceClientTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ReplicatedResourceClientTest.java index 875048d1f5d4..598f2cbacb8e 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/ReplicatedResourceClientTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/ReplicatedResourceClientTest.java @@ -1,18 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.internal.directconnectivity.*; -import com.azure.data.cosmos.internal.Configs; -import com.azure.data.cosmos.internal.IAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.FailureValidator; -import com.azure.data.cosmos.internal.directconnectivity.*; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import io.reactivex.subscribers.TestSubscriber; import org.assertj.core.api.Assertions; import org.mockito.Matchers; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/RntbdTransportClientTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/RntbdTransportClientTest.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/RntbdTransportClientTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/RntbdTransportClientTest.java index be84e94dfcb0..b0473dcf2b47 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/RntbdTransportClientTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/RntbdTransportClientTest.java @@ -1,51 +1,51 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.BadRequestException; -import com.azure.data.cosmos.ConflictException; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.CosmosKeyCredential; -import com.azure.data.cosmos.ForbiddenException; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.InternalServerErrorException; -import com.azure.data.cosmos.InvalidPartitionException; -import com.azure.data.cosmos.LockedException; -import com.azure.data.cosmos.MethodNotAllowedException; -import com.azure.data.cosmos.NotFoundException; -import com.azure.data.cosmos.PartitionIsMigratingException; -import com.azure.data.cosmos.PartitionKeyRangeGoneException; -import com.azure.data.cosmos.PartitionKeyRangeIsSplittingException; -import com.azure.data.cosmos.PreconditionFailedException; -import com.azure.data.cosmos.RequestEntityTooLargeException; -import com.azure.data.cosmos.RequestRateTooLargeException; -import com.azure.data.cosmos.RequestTimeoutException; -import com.azure.data.cosmos.RetryWithException; -import com.azure.data.cosmos.ServiceUnavailableException; -import com.azure.data.cosmos.UnauthorizedException; -import com.azure.data.cosmos.internal.BaseAuthorizationTokenProvider; -import com.azure.data.cosmos.internal.FailureValidator; -import com.azure.data.cosmos.internal.OperationType; -import com.azure.data.cosmos.internal.Paths; -import com.azure.data.cosmos.internal.ResourceType; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.UserAgentContainer; -import com.azure.data.cosmos.internal.Utils; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdClientChannelHealthChecker; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdContext; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdContextNegotiator; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdContextRequest; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdEndpoint; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdRequest; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdRequestArgs; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdRequestEncoder; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdRequestManager; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdRequestRecord; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdRequestTimer; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdResponse; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdResponseDecoder; -import com.azure.data.cosmos.internal.directconnectivity.rntbd.RntbdUUID; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BadRequestException; +import com.azure.cosmos.ConflictException; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosKeyCredential; +import com.azure.cosmos.ForbiddenException; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.InternalServerErrorException; +import com.azure.cosmos.InvalidPartitionException; +import com.azure.cosmos.LockedException; +import com.azure.cosmos.MethodNotAllowedException; +import com.azure.cosmos.NotFoundException; +import com.azure.cosmos.PartitionIsMigratingException; +import com.azure.cosmos.PartitionKeyRangeGoneException; +import com.azure.cosmos.PartitionKeyRangeIsSplittingException; +import com.azure.cosmos.PreconditionFailedException; +import com.azure.cosmos.RequestEntityTooLargeException; +import com.azure.cosmos.RequestRateTooLargeException; +import com.azure.cosmos.RequestTimeoutException; +import com.azure.cosmos.RetryWithException; +import com.azure.cosmos.ServiceUnavailableException; +import com.azure.cosmos.UnauthorizedException; +import com.azure.cosmos.internal.BaseAuthorizationTokenProvider; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.Paths; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.UserAgentContainer; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdClientChannelHealthChecker; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdContext; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdContextNegotiator; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdContextRequest; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdEndpoint; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdRequest; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdRequestArgs; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdRequestEncoder; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdRequestManager; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdRequestRecord; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdRequestTimer; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdResponse; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdResponseDecoder; +import com.azure.cosmos.internal.directconnectivity.rntbd.RntbdUUID; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import io.micrometer.core.instrument.Tag; @@ -73,9 +73,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Stream; -import static com.azure.data.cosmos.internal.HttpConstants.HttpHeaders; -import static com.azure.data.cosmos.internal.HttpConstants.HttpMethods; -import static com.azure.data.cosmos.internal.HttpConstants.SubStatusCodes; +import static com.azure.cosmos.internal.HttpConstants.HttpHeaders; +import static com.azure.cosmos.internal.HttpConstants.HttpMethods; +import static com.azure.cosmos.internal.HttpConstants.SubStatusCodes; import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreReaderDotNetTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreReaderDotNetTest.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreReaderDotNetTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreReaderDotNetTest.java index 714c1bef2cd9..b2354a8d040b 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreReaderDotNetTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreReaderDotNetTest.java @@ -1,17 +1,33 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.internal.ISessionContainer; -import com.azure.data.cosmos.ServiceUnavailableException; -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.InvalidPartitionException; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.InvalidPartitionException; +import com.azure.cosmos.ServiceUnavailableException; +import com.azure.cosmos.internal.AuthorizationTokenType; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.DocumentServiceRequestContext; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IAuthorizationTokenProvider; +import com.azure.cosmos.internal.ISessionContainer; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.ReplicationPolicy; +import com.azure.cosmos.internal.RequestChargeTracker; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.RxDocumentServiceResponse; +import com.azure.cosmos.internal.SessionContainer; +import com.azure.cosmos.internal.StoreResponseBuilder; +import com.azure.cosmos.internal.Strings; import io.reactivex.subscribers.TestSubscriber; import org.apache.commons.lang3.StringUtils; +import org.assertj.core.api.Assertions; import org.mockito.Matchers; import org.mockito.Mockito; import org.slf4j.Logger; @@ -486,7 +502,7 @@ public void storeReaderBarrier() { ReadMode.Strong).block(); // make sure we got 2 responses from the store reader - assertThat(result).hasSize(2); + Assertions.assertThat(result).hasSize(2); } public static void validateSuccess(Mono> single, diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreReaderTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreReaderTest.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreReaderTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreReaderTest.java index 25cbe0ad1541..1ae5469913fc 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreReaderTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreReaderTest.java @@ -1,18 +1,29 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; - -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.GoneException; -import com.azure.data.cosmos.internal.ISessionContainer; -import com.azure.data.cosmos.PartitionKeyRangeGoneException; -import com.azure.data.cosmos.RequestRateTooLargeException; -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.NotFoundException; -import com.azure.data.cosmos.PartitionIsMigratingException; -import com.azure.data.cosmos.PartitionKeyRangeIsSplittingException; +package com.azure.cosmos.internal.directconnectivity; + +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.GoneException; +import com.azure.cosmos.NotFoundException; +import com.azure.cosmos.PartitionIsMigratingException; +import com.azure.cosmos.PartitionKeyRangeGoneException; +import com.azure.cosmos.PartitionKeyRangeIsSplittingException; +import com.azure.cosmos.RequestRateTooLargeException; +import com.azure.cosmos.internal.DocumentServiceRequestContext; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.ISessionContainer; +import com.azure.cosmos.internal.ISessionToken; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.RequestChargeTracker; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.StoreResponseBuilder; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.VectorSessionToken; import com.google.common.collect.ImmutableList; import io.reactivex.subscribers.TestSubscriber; import org.assertj.core.api.AssertionsForClassTypes; @@ -28,10 +39,10 @@ import java.util.concurrent.CyclicBarrier; import java.util.concurrent.TimeUnit; -import static com.azure.data.cosmos.internal.HttpConstants.StatusCodes.GONE; -import static com.azure.data.cosmos.internal.HttpConstants.SubStatusCodes.COMPLETING_PARTITION_MIGRATION; -import static com.azure.data.cosmos.internal.HttpConstants.SubStatusCodes.COMPLETING_SPLIT; -import static com.azure.data.cosmos.internal.HttpConstants.SubStatusCodes.PARTITION_KEY_RANGE_GONE; +import static com.azure.cosmos.internal.HttpConstants.StatusCodes.GONE; +import static com.azure.cosmos.internal.HttpConstants.SubStatusCodes.COMPLETING_PARTITION_MIGRATION; +import static com.azure.cosmos.internal.HttpConstants.SubStatusCodes.COMPLETING_SPLIT; +import static com.azure.cosmos.internal.HttpConstants.SubStatusCodes.PARTITION_KEY_RANGE_GONE; import static org.assertj.core.api.Assertions.assertThat; public class StoreReaderTest { diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreReaderUnderTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreReaderUnderTest.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreReaderUnderTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreReaderUnderTest.java index 2bd89fc5ac90..a05157589f11 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreReaderUnderTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreReaderUnderTest.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.ISessionContainer; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.ISessionContainer; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import com.google.common.collect.ImmutableList; import org.apache.commons.lang3.tuple.Pair; import reactor.core.publisher.Mono; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreResponseTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreResponseTest.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreResponseTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreResponseTest.java index ce43e5a74239..b86992ebf6c6 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreResponseTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreResponseTest.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.directconnectivity.StoreResponse; import org.apache.commons.io.IOUtils; +import org.assertj.core.api.Assertions; import org.testng.annotations.Test; import java.io.ByteArrayInputStream; @@ -44,6 +44,6 @@ public void streamContent() throws Exception { assertThat(sp.getStatus()).isEqualTo(200); assertThat(sp.getResponseBody()).isNull(); assertThat(sp.getResponseStream()).isNotNull(); - assertThat(IOUtils.contentEquals(new ByteArrayInputStream(baos.toByteArray()), sp.getResponseStream())); + Assertions.assertThat(IOUtils.contentEquals(new ByteArrayInputStream(baos.toByteArray()), sp.getResponseStream())); } } diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreResponseValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreResponseValidator.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreResponseValidator.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreResponseValidator.java index 00a1cdcdd46b..80f0574d445e 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreResponseValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreResponseValidator.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.HttpConstants; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.HttpConstants; import org.assertj.core.api.Condition; import java.util.ArrayList; @@ -187,4 +187,4 @@ public Builder withBEGlobalLSNGreaterThanOrEqualTo(long minLSN) { return this; } } -} \ No newline at end of file +} diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreResultValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreResultValidator.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreResultValidator.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreResultValidator.java index 08415568e545..5d1e0c851115 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreResultValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/StoreResultValidator.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.FailureValidator; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.internal.FailureValidator; import java.net.URI; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/TimeoutHelperTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/TimeoutHelperTest.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/TimeoutHelperTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/TimeoutHelperTest.java index 874c0f2994bb..15239ce9c039 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/TimeoutHelperTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/TimeoutHelperTest.java @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.directconnectivity.TimeoutHelper; import org.testng.annotations.Test; import java.time.Duration; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/TransportClientWrapper.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/TransportClientWrapper.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/TransportClientWrapper.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/TransportClientWrapper.java index d30a118f0991..ef028e60f635 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/TransportClientWrapper.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/TransportClientWrapper.java @@ -1,9 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.*; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Utils; import org.apache.commons.lang3.tuple.Pair; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/WebExceptionUtilityTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/WebExceptionUtilityTest.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/WebExceptionUtilityTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/WebExceptionUtilityTest.java index eeaecdac2963..ddfc6803a11a 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/WebExceptionUtilityTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/directconnectivity/WebExceptionUtilityTest.java @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.directconnectivity; +package com.azure.cosmos.internal.directconnectivity; -import com.azure.data.cosmos.internal.directconnectivity.WebExceptionUtility; import io.netty.channel.ChannelException; import io.netty.channel.ConnectTimeoutException; import io.netty.handler.timeout.ReadTimeoutException; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/query/DocumentProducerTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/query/DocumentProducerTest.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/query/DocumentProducerTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/query/DocumentProducerTest.java index 625fa7fa2336..a9844d7f7996 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/query/DocumentProducerTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/query/DocumentProducerTest.java @@ -1,24 +1,24 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.CosmosError; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.internal.PartitionKeyRange; -import com.azure.data.cosmos.internal.GlobalEndpointManager; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.IRetryPolicyFactory; -import com.azure.data.cosmos.internal.RetryPolicy; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; -import com.azure.data.cosmos.internal.caches.RxPartitionKeyRangeCache; -import com.azure.data.cosmos.internal.query.orderbyquery.OrderByRowResult; -import com.azure.data.cosmos.internal.query.orderbyquery.OrderbyRowComparer; -import com.azure.data.cosmos.internal.routing.PartitionKeyRangeIdentity; -import com.azure.data.cosmos.internal.routing.Range; +package com.azure.cosmos.internal.query; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosError; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.GlobalEndpointManager; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.IRetryPolicyFactory; +import com.azure.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.RetryPolicy; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.caches.RxPartitionKeyRangeCache; +import com.azure.cosmos.internal.query.orderbyquery.OrderByRowResult; +import com.azure.cosmos.internal.query.orderbyquery.OrderbyRowComparer; +import com.azure.cosmos.internal.routing.PartitionKeyRangeIdentity; +import com.azure.cosmos.internal.routing.Range; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; @@ -26,6 +26,7 @@ import com.google.common.collect.LinkedListMultimap; import io.reactivex.subscribers.TestSubscriber; import org.apache.commons.lang3.RandomUtils; +import org.assertj.core.api.Assertions; import org.mockito.Matchers; import org.mockito.Mockito; import org.slf4j.Logger; @@ -631,7 +632,7 @@ public int compare(Document o1, Document o2) { assertThat(actualDocuments).containsExactlyElementsOf(expectedDocuments.stream().map(d -> d.getId()).collect(Collectors.toList())); } else { - assertThat(actualPages).hasSize(resultFromParent.size() + resultFromLeftChild.size() + resultFromRightChild.size()); + Assertions.assertThat(actualPages).hasSize(resultFromParent.size() + resultFromLeftChild.size() + resultFromRightChild.size()); BiFunction> repeater = (v, cnt) -> { return IntStream.range(0, cnt).mapToObj(i -> v); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/query/FeedResponseBuilder.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/query/FeedResponseBuilder.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/query/FeedResponseBuilder.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/query/FeedResponseBuilder.java index c76a2eb4ffa0..5fa31d37d82a 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/query/FeedResponseBuilder.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/query/FeedResponseBuilder.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.RxDocumentServiceResponse; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.RxDocumentServiceResponse; import java.util.Arrays; import java.util.HashMap; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/query/FetcherTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/query/FetcherTest.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/query/FetcherTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/query/FetcherTest.java index 16de0c407dbf..b4e3a73d0cfa 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/query/FetcherTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/query/FetcherTest.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.query; +package com.azure.cosmos.internal.query; -import com.azure.data.cosmos.ChangeFeedOptions; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.ChangeFeedOptions; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.RxDocumentServiceRequest; import io.reactivex.subscribers.TestSubscriber; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/routing/InMemoryCollectionRoutingMapTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/routing/InMemoryCollectionRoutingMapTest.java similarity index 99% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/routing/InMemoryCollectionRoutingMapTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/routing/InMemoryCollectionRoutingMapTest.java index 5d0471a438da..a2de7c925321 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/routing/InMemoryCollectionRoutingMapTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/routing/InMemoryCollectionRoutingMapTest.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.PartitionKeyRange; import com.google.common.collect.ImmutableList; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/routing/LocationCacheTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/routing/LocationCacheTest.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/routing/LocationCacheTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/routing/LocationCacheTest.java index 77baf7fa10bd..3ca9e4b3c49b 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/routing/LocationCacheTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/routing/LocationCacheTest.java @@ -1,15 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; - -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.BridgeUtils; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.DatabaseAccount; -import com.azure.data.cosmos.DatabaseAccountLocation; -import com.azure.data.cosmos.internal.DatabaseAccountManagerInternal; -import com.azure.data.cosmos.internal.*; +package com.azure.cosmos.internal.routing; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.BridgeUtils; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.DatabaseAccount; +import com.azure.cosmos.DatabaseAccountLocation; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.DatabaseAccountManagerInternal; +import com.azure.cosmos.internal.GlobalEndpointManager; +import com.azure.cosmos.internal.OperationType; +import com.azure.cosmos.internal.ResourceType; +import com.azure.cosmos.internal.RxDocumentServiceRequest; +import com.azure.cosmos.internal.Utils; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import org.apache.commons.collections4.list.UnmodifiableList; @@ -34,7 +39,7 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -import static com.azure.data.cosmos.BridgeUtils.createDatabaseAccountLocation; +import static com.azure.cosmos.BridgeUtils.createDatabaseAccountLocation; import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/routing/PartitionKeyInternalUtils.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/routing/PartitionKeyInternalUtils.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/routing/PartitionKeyInternalUtils.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/routing/PartitionKeyInternalUtils.java index 28cee56bfba8..bdbd11fd3ffe 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/routing/PartitionKeyInternalUtils.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/routing/PartitionKeyInternalUtils.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; import com.google.common.collect.ImmutableList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/routing/RoutingMapProviderHelperTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/routing/RoutingMapProviderHelperTest.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/routing/RoutingMapProviderHelperTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/routing/RoutingMapProviderHelperTest.java index a1feace139d1..bc57bd7a62ae 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/routing/RoutingMapProviderHelperTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/routing/RoutingMapProviderHelperTest.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; -import com.azure.data.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.internal.PartitionKeyRange; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.testng.annotations.Test; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/routing/StringPartitionKeyComponentTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/routing/StringPartitionKeyComponentTest.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/routing/StringPartitionKeyComponentTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/routing/StringPartitionKeyComponentTest.java index 49dbcfefcf1e..ae12263dfe45 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/routing/StringPartitionKeyComponentTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/internal/routing/StringPartitionKeyComponentTest.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.internal.routing; +package com.azure.cosmos.internal.routing; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/AggregateQueryTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/AggregateQueryTests.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/AggregateQueryTests.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/AggregateQueryTests.java index b6d9703af3d0..f703fd9e8861 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/AggregateQueryTests.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/AggregateQueryTests.java @@ -1,11 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncContainer; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.internal.FeedResponseListValidator; +package com.azure.cosmos.rx; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.FeedResponseListValidator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/BackPressureCrossPartitionTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/BackPressureCrossPartitionTest.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/BackPressureCrossPartitionTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/BackPressureCrossPartitionTest.java index 73d704064cb8..aab43514cd0c 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/BackPressureCrossPartitionTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/BackPressureCrossPartitionTest.java @@ -1,11 +1,26 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.RxDocumentClientUnderTest; -import com.azure.data.cosmos.internal.TestUtils; +package com.azure.cosmos.rx; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ClientUnderTestBuilder; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosBridgeInternal; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosContainerProperties; +import com.azure.cosmos.CosmosContainerRequestOptions; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.DataType; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +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.RxDocumentClientUnderTest; +import com.azure.cosmos.internal.TestUtils; import io.reactivex.subscribers.TestSubscriber; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -110,7 +125,7 @@ public void query(String query, int maxItemCount, int maxExpectedBufferedCountFo options.setMaxDegreeOfParallelism(2); Flux> queryObservable = createdCollection.queryItems(query, options); - RxDocumentClientUnderTest rxClient = (RxDocumentClientUnderTest)CosmosBridgeInternal.getAsyncDocumentClient(client); + RxDocumentClientUnderTest rxClient = (RxDocumentClientUnderTest) CosmosBridgeInternal.getAsyncDocumentClient(client); rxClient.httpRequests.clear(); log.info("instantiating subscriber ..."); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/BackPressureTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/BackPressureTest.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/BackPressureTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/BackPressureTest.java index d9852b951f39..1b21dae944a0 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/BackPressureTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/BackPressureTest.java @@ -1,18 +1,28 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncContainer; -import com.azure.data.cosmos.internal.Offer; -import com.azure.data.cosmos.internal.RxDocumentClientUnderTest; -import com.azure.data.cosmos.internal.TestUtils; +package com.azure.cosmos.rx; + +import com.azure.cosmos.ClientUnderTestBuilder; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosBridgeInternal; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosContainerProperties; +import com.azure.cosmos.CosmosContainerRequestOptions; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.internal.Offer; +import com.azure.cosmos.internal.RxDocumentClientUnderTest; +import com.azure.cosmos.internal.TestUtils; import io.reactivex.subscribers.TestSubscriber; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import reactor.core.scheduler.Schedulers; import reactor.util.concurrent.Queues; @@ -63,7 +73,7 @@ public void readFeed() throws Exception { options.setEnableCrossPartitionQuery(true); Flux> queryObservable = createdCollection.readAllItems(options); - RxDocumentClientUnderTest rxClient = (RxDocumentClientUnderTest)CosmosBridgeInternal.getAsyncDocumentClient(client); + RxDocumentClientUnderTest rxClient = (RxDocumentClientUnderTest) CosmosBridgeInternal.getAsyncDocumentClient(client); rxClient.httpRequests.clear(); TestSubscriber> subscriber = new TestSubscriber>(1); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ChangeFeedProcessorTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ChangeFeedProcessorTest.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ChangeFeedProcessorTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ChangeFeedProcessorTest.java index 0fe490fffdc9..da09b3bcc5d1 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ChangeFeedProcessorTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ChangeFeedProcessorTest.java @@ -1,10 +1,26 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncDatabase; -import com.azure.data.cosmos.internal.changefeed.ServiceItemLease; +package com.azure.cosmos.rx; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ChangeFeedProcessor; +import com.azure.cosmos.ChangeFeedProcessorOptions; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosAsyncItemResponse; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosContainerProperties; +import com.azure.cosmos.CosmosContainerRequestOptions; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.SerializationFormattingPolicy; +import com.azure.cosmos.SqlParameter; +import com.azure.cosmos.SqlParameterList; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.changefeed.ServiceItemLease; import org.apache.commons.lang3.RandomStringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -328,8 +344,8 @@ public void beforeClass() { // .map(cosmosDatabaseResponse -> cosmosDatabaseResponse.database()) // .flatMap(database -> database.delete()) // .onErrorResume(throwable -> { -// if (throwable instanceof com.azure.data.cosmos.CosmosClientException) { -// com.azure.data.cosmos.CosmosClientException clientException = (com.azure.data.cosmos.CosmosClientException) throwable; +// if (throwable instanceof com.azure.cosmos.CosmosClientException) { +// com.azure.cosmos.CosmosClientException clientException = (com.azure.cosmos.CosmosClientException) throwable; // if (clientException.statusCode() == 404) { // return Mono.empty(); // } diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ChangeFeedTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ChangeFeedTest.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ChangeFeedTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ChangeFeedTest.java index 4b8d7f97098d..2946fed34876 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ChangeFeedTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ChangeFeedTest.java @@ -1,19 +1,22 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ChangeFeedOptions; -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.FeedResponse; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.TestSuiteBase; +package com.azure.cosmos.rx; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ChangeFeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.TestSuiteBase; +import com.azure.cosmos.internal.TestUtils; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import org.testng.SkipException; @@ -31,7 +34,7 @@ import java.util.List; import java.util.UUID; -import static com.azure.data.cosmos.CommonsBridgeInternal.partitionKeyRangeIdInternal; +import static com.azure.cosmos.CommonsBridgeInternal.partitionKeyRangeIdInternal; import static org.assertj.core.api.Assertions.assertThat; //TODO: change to use external TestSuiteBase diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/CollectionCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CollectionCrudTest.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/CollectionCrudTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CollectionCrudTest.java index 477eeec573bf..1805e5066f94 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/CollectionCrudTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CollectionCrudTest.java @@ -1,12 +1,32 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.FailureValidator; -import com.azure.data.cosmos.internal.RetryAnalyzer; +package com.azure.cosmos.rx; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CompositePath; +import com.azure.cosmos.CompositePathSortOrder; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncContainerResponse; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosAsyncItem; +import com.azure.cosmos.CosmosAsyncItemResponse; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosContainerProperties; +import com.azure.cosmos.CosmosContainerRequestOptions; +import com.azure.cosmos.CosmosDatabaseForTest; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.CosmosResponseValidator; +import com.azure.cosmos.IndexingMode; +import com.azure.cosmos.IndexingPolicy; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.SpatialSpec; +import com.azure.cosmos.SpatialType; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.RetryAnalyzer; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/CollectionQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CollectionQueryTest.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/CollectionQueryTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CollectionQueryTest.java index 399824438b16..100887d7daa7 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/CollectionQueryTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CollectionQueryTest.java @@ -1,11 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncContainer; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.FeedResponseValidator; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosContainerProperties; +import com.azure.cosmos.CosmosDatabaseForTest; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; import org.apache.commons.lang3.StringUtils; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/CosmosAsyncConflictTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CosmosAsyncConflictTest.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/CosmosAsyncConflictTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CosmosAsyncConflictTest.java index 3c47ec2b4c1e..c189503f087c 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/CosmosAsyncConflictTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CosmosAsyncConflictTest.java @@ -1,10 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.HttpConstants; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosConflictProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.HttpConstants; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/DatabaseCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DatabaseCrudTest.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/DatabaseCrudTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DatabaseCrudTest.java index 2d2ee1e26740..8fda5fd3288b 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/DatabaseCrudTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DatabaseCrudTest.java @@ -1,10 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncDatabase; -import com.azure.data.cosmos.internal.FailureValidator; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosAsyncDatabaseResponse; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosDatabaseForTest; +import com.azure.cosmos.CosmosDatabaseProperties; +import com.azure.cosmos.CosmosDatabaseRequestOptions; +import com.azure.cosmos.CosmosResponseValidator; +import com.azure.cosmos.internal.FailureValidator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/DatabaseQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DatabaseQueryTest.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/DatabaseQueryTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DatabaseQueryTest.java index 9f4d814f15ed..289d0de42e21 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/DatabaseQueryTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DatabaseQueryTest.java @@ -1,11 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncDatabase; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.FeedResponseValidator; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosDatabaseForTest; +import com.azure.cosmos.CosmosDatabaseProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; import org.apache.commons.lang3.StringUtils; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/DocumentClientResourceLeakTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentClientResourceLeakTest.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/DocumentClientResourceLeakTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentClientResourceLeakTest.java index 51ab8c2858f7..800839d70d33 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/DocumentClientResourceLeakTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentClientResourceLeakTest.java @@ -1,9 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; +package com.azure.cosmos.rx; -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosItemProperties; import com.google.common.base.Strings; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/DocumentCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentCrudTest.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/DocumentCrudTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentCrudTest.java index 9b04b04800cf..d651d43afe5c 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/DocumentCrudTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentCrudTest.java @@ -1,17 +1,26 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncItem; -import com.azure.data.cosmos.internal.FailureValidator; +package com.azure.cosmos.rx; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncItem; +import com.azure.cosmos.CosmosAsyncItemResponse; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.CosmosResponseValidator; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.internal.FailureValidator; import org.apache.commons.lang3.StringUtils; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Factory; -import org.testng.annotations.Test; import org.testng.annotations.Ignore; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; import reactor.core.publisher.Mono; import java.time.Duration; @@ -99,7 +108,7 @@ public void readDocumentWithVeryLargePartitionKey(String documentId) throws Inte } BridgeInternal.setProperty(docDefinition, "mypk", sb.toString()); - CosmosAsyncItem createdDocument = TestSuiteBase.createDocument(container, docDefinition); + CosmosAsyncItem createdDocument = createDocument(container, docDefinition); waitIfNeededForReplicasToCatchUp(clientBuilder()); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/LogLevelTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/LogLevelTest.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/LogLevelTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/LogLevelTest.java index d72e7d28ea08..dfe7b4b32e0b 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/LogLevelTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/LogLevelTest.java @@ -1,22 +1,26 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncItemResponse; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.CosmosResponseValidator; import org.apache.log4j.Level; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; import org.apache.log4j.PropertyConfigurator; import org.apache.log4j.WriterAppender; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; import org.testng.annotations.AfterClass; +import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Mono; import java.io.StringWriter; @@ -26,8 +30,8 @@ import static org.assertj.core.api.Assertions.assertThat; public class LogLevelTest extends TestSuiteBase { - public final static String COSMOS_DB_LOGGING_CATEGORY = "com.azure.data.cosmos"; - public final static String NETWORK_LOGGING_CATEGORY = "com.azure.data.cosmos.netty-network"; + public final static String COSMOS_DB_LOGGING_CATEGORY = "com.azure.cosmos"; + public final static String NETWORK_LOGGING_CATEGORY = "com.azure.cosmos.netty-network"; public final static String LOG_PATTERN_1 = "HTTP/1.1 200 Ok."; public final static String LOG_PATTERN_2 = "| 0 1 2 3 4 5 6 7 8 9 a b c d e f |"; public final static String LOG_PATTERN_3 = "USER_EVENT: SslHandshakeCompletionEvent(SUCCESS)"; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/MultiMasterConflictResolutionTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/MultiMasterConflictResolutionTest.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/MultiMasterConflictResolutionTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/MultiMasterConflictResolutionTest.java index e2aac37341ac..4eee471f0758 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/MultiMasterConflictResolutionTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/MultiMasterConflictResolutionTest.java @@ -1,11 +1,22 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.FailureValidator; -import com.azure.data.cosmos.internal.Utils; +package com.azure.cosmos.rx; + +import com.azure.cosmos.BridgeUtils; +import com.azure.cosmos.ConflictResolutionMode; +import com.azure.cosmos.ConflictResolutionPolicy; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncContainerResponse; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosContainerProperties; +import com.azure.cosmos.CosmosContainerRequestOptions; +import com.azure.cosmos.CosmosDatabaseForTest; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.Utils; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/MultiOrderByQueryTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/MultiOrderByQueryTests.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/MultiOrderByQueryTests.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/MultiOrderByQueryTests.java index 9c6f9fec4807..ed8d9784bd58 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/MultiOrderByQueryTests.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/MultiOrderByQueryTests.java @@ -1,12 +1,22 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; +package com.azure.cosmos.rx; -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.FailureValidator; -import com.azure.data.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CompositePath; +import com.azure.cosmos.CompositePathSortOrder; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosContainerProperties; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.FeedResponseListValidator; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.collections4.ComparatorUtils; import org.testng.annotations.AfterClass; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/OfferQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/OfferQueryTest.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/OfferQueryTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/OfferQueryTest.java index 8f70819be9ed..4306992db19d 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/OfferQueryTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/OfferQueryTest.java @@ -1,16 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.internal.AsyncDocumentClient.Builder; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.internal.TestSuiteBase; +package com.azure.cosmos.rx; + +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.AsyncDocumentClient.Builder; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.DatabaseForTest; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; +import com.azure.cosmos.internal.Offer; +import com.azure.cosmos.internal.TestSuiteBase; +import com.azure.cosmos.internal.TestUtils; import org.assertj.core.util.Strings; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/OfferReadReplaceTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/OfferReadReplaceTest.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/OfferReadReplaceTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/OfferReadReplaceTest.java index b0468c60e5b9..b2cd1564cf20 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/OfferReadReplaceTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/OfferReadReplaceTest.java @@ -1,12 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.internal.TestSuiteBase; +package com.azure.cosmos.rx; + +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.DatabaseForTest; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.Offer; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.ResourceResponseValidator; +import com.azure.cosmos.internal.TestSuiteBase; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/OrderbyDocumentQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/OrderbyDocumentQueryTest.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/OrderbyDocumentQueryTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/OrderbyDocumentQueryTest.java index 691c4a6ef6b5..c92ecf26094c 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/OrderbyDocumentQueryTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/OrderbyDocumentQueryTest.java @@ -1,25 +1,40 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.internal.Utils.ValueHolder; -import com.azure.data.cosmos.internal.query.CompositeContinuationToken; -import com.azure.data.cosmos.internal.query.OrderByContinuationToken; -import com.azure.data.cosmos.internal.query.QueryItem; -import com.azure.data.cosmos.internal.routing.Range; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosBridgeInternal; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; +import com.azure.cosmos.internal.ResourceValidator; +import com.azure.cosmos.internal.RetryAnalyzer; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.Utils.ValueHolder; +import com.azure.cosmos.internal.query.CompositeContinuationToken; +import com.azure.cosmos.internal.query.OrderByContinuationToken; +import com.azure.cosmos.internal.query.QueryItem; +import com.azure.cosmos.internal.routing.Range; import com.fasterxml.jackson.core.JsonProcessingException; import io.reactivex.subscribers.TestSubscriber; import org.apache.commons.lang3.StringUtils; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ParallelDocumentQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ParallelDocumentQueryTest.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ParallelDocumentQueryTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ParallelDocumentQueryTest.java index 0571e78b616b..302dccbe7145 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ParallelDocumentQueryTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ParallelDocumentQueryTest.java @@ -1,20 +1,33 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.internal.Utils.ValueHolder; -import com.azure.data.cosmos.internal.query.CompositeContinuationToken; -import com.azure.data.cosmos.internal.routing.Range; +package com.azure.cosmos.rx; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosBridgeInternal; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; +import com.azure.cosmos.internal.QueryMetrics; +import com.azure.cosmos.internal.TestUtils; +import com.azure.cosmos.internal.Utils.ValueHolder; +import com.azure.cosmos.internal.query.CompositeContinuationToken; +import com.azure.cosmos.internal.routing.Range; import io.reactivex.subscribers.TestSubscriber; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Factory; -import org.testng.annotations.Test; import org.testng.annotations.Ignore; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.util.ArrayList; @@ -24,7 +37,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.azure.data.cosmos.CommonsBridgeInternal.partitionKeyRangeIdInternal; +import static com.azure.cosmos.CommonsBridgeInternal.partitionKeyRangeIdInternal; import static org.assertj.core.api.Assertions.assertThat; //FIXME beforeClass times out inconsistently diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ParsingEnvTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ParsingEnvTest.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ParsingEnvTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ParsingEnvTest.java index b055cc2b7b81..9225c5cb0dad 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ParsingEnvTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ParsingEnvTest.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; +package com.azure.cosmos.rx; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.internal.directconnectivity.Protocol; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.internal.directconnectivity.Protocol; import org.testng.annotations.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/PermissionCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/PermissionCrudTest.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/PermissionCrudTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/PermissionCrudTest.java index fe896f02b227..61a9f61a7e2d 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/PermissionCrudTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/PermissionCrudTest.java @@ -1,10 +1,19 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.FailureValidator; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosAsyncPermission; +import com.azure.cosmos.CosmosAsyncPermissionResponse; +import com.azure.cosmos.CosmosAsyncUser; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosDatabaseForTest; +import com.azure.cosmos.CosmosPermissionProperties; +import com.azure.cosmos.CosmosResponseValidator; +import com.azure.cosmos.CosmosUserProperties; +import com.azure.cosmos.PermissionMode; +import com.azure.cosmos.internal.FailureValidator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/PermissionQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/PermissionQueryTest.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/PermissionQueryTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/PermissionQueryTest.java index 7902d992d562..1760d761ff6a 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/PermissionQueryTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/PermissionQueryTest.java @@ -1,21 +1,26 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.CosmosClientException; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.PermissionMode; -import com.azure.data.cosmos.internal.TestSuiteBase; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PermissionMode; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.DatabaseForTest; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; +import com.azure.cosmos.internal.Permission; +import com.azure.cosmos.internal.TestSuiteBase; +import com.azure.cosmos.internal.User; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ProxyHostTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ProxyHostTest.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ProxyHostTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ProxyHostTest.java index ef384eec50da..f8696e48d056 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ProxyHostTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ProxyHostTest.java @@ -1,23 +1,30 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.TestConfigurations; -import com.azure.data.cosmos.rx.proxy.HttpProxyServer; +package com.azure.cosmos.rx; + +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosAsyncItemResponse; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.CosmosResponseValidator; +import com.azure.cosmos.internal.TestConfigurations; +import com.azure.cosmos.rx.proxy.HttpProxyServer; import org.apache.log4j.Level; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; import org.apache.log4j.PropertyConfigurator; import org.apache.log4j.WriterAppender; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; import org.testng.annotations.AfterClass; +import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Mono; import java.io.StringWriter; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedCollectionsTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedCollectionsTest.java similarity index 84% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedCollectionsTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedCollectionsTest.java index 4666389cfc11..4f917d73c4b0 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedCollectionsTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedCollectionsTest.java @@ -1,11 +1,19 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.FeedResponseValidator; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosContainerProperties; +import com.azure.cosmos.CosmosContainerRequestOptions; +import com.azure.cosmos.CosmosDatabaseForTest; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedDatabasesTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedDatabasesTest.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedDatabasesTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedDatabasesTest.java index 655dc7f51652..3b683e82153d 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedDatabasesTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedDatabasesTest.java @@ -1,11 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; +package com.azure.cosmos.rx; -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.FeedResponseValidator; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosDatabaseProperties; +import com.azure.cosmos.CosmosDatabaseRequestOptions; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedDocumentsTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedDocumentsTest.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedDocumentsTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedDocumentsTest.java index f941205f4e6f..453abfb09efc 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedDocumentsTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedDocumentsTest.java @@ -1,17 +1,23 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.FailureValidator; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.FeedResponseValidator; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedExceptionHandlingTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedExceptionHandlingTest.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedExceptionHandlingTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedExceptionHandlingTest.java index 93062088c516..963f7018d826 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedExceptionHandlingTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedExceptionHandlingTest.java @@ -1,9 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; +package com.azure.cosmos.rx; -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosDatabaseProperties; +import com.azure.cosmos.FeedResponse; import io.reactivex.subscribers.TestSubscriber; import org.mockito.Mockito; import org.testng.annotations.AfterClass; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedOffersTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedOffersTest.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedOffersTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedOffersTest.java index f7676ccc2446..8639583bd027 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedOffersTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedOffersTest.java @@ -1,15 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.internal.TestSuiteBase; +package com.azure.cosmos.rx; + +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.DatabaseForTest; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; +import com.azure.cosmos.internal.Offer; +import com.azure.cosmos.internal.TestSuiteBase; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedPermissionsTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedPermissionsTest.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedPermissionsTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedPermissionsTest.java index ba3c668befda..0f73145096ec 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedPermissionsTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedPermissionsTest.java @@ -1,15 +1,19 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.PermissionMode; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.internal.TestSuiteBase; +package com.azure.cosmos.rx; + +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PermissionMode; +import com.azure.cosmos.Resource; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.DatabaseForTest; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; +import com.azure.cosmos.internal.Permission; +import com.azure.cosmos.internal.TestSuiteBase; +import com.azure.cosmos.internal.User; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedPkrTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedPkrTests.java similarity index 80% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedPkrTests.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedPkrTests.java index 0a995ac371cc..e24ea2921acc 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedPkrTests.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedPkrTests.java @@ -1,12 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; +package com.azure.cosmos.rx; -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.CosmosAsyncDatabase; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.PartitionKeyRange; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosBridgeInternal; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosContainerRequestOptions; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.PartitionKeyRange; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedStoredProceduresTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedStoredProceduresTest.java similarity index 87% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedStoredProceduresTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedStoredProceduresTest.java index d3017535b41d..2c953bada02e 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedStoredProceduresTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedStoredProceduresTest.java @@ -1,16 +1,21 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncContainer; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.FeedResponseValidator; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosStoredProcedureProperties; +import com.azure.cosmos.CosmosStoredProcedureRequestOptions; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedTriggersTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedTriggersTest.java similarity index 86% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedTriggersTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedTriggersTest.java index 78634a06e5e8..9ef6c1a3deee 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedTriggersTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedTriggersTest.java @@ -1,16 +1,22 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.FeedResponseValidator; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosTriggerProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.TriggerOperation; +import com.azure.cosmos.TriggerType; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedUdfsTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedUdfsTest.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedUdfsTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedUdfsTest.java index 5c34dc864bd7..973b1807dcfe 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedUdfsTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedUdfsTest.java @@ -1,17 +1,21 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.FeedResponseValidator; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosUserDefinedFunctionProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedUsersTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedUsersTest.java similarity index 85% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedUsersTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedUsersTest.java index 13e19180ac52..060129086720 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ReadFeedUsersTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedUsersTest.java @@ -1,11 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncDatabase; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.FeedResponseValidator; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosDatabaseForTest; +import com.azure.cosmos.CosmosUserProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ResourceTokenTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ResourceTokenTest.java similarity index 96% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ResourceTokenTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ResourceTokenTest.java index a3853b314a82..50061f5b2407 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/ResourceTokenTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ResourceTokenTest.java @@ -1,25 +1,33 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.internal.Document; -import com.azure.data.cosmos.internal.DocumentCollection; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.PartitionKeyDefinition; -import com.azure.data.cosmos.PermissionMode; -import com.azure.data.cosmos.internal.TestSuiteBase; +package com.azure.cosmos.rx; + +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.PermissionMode; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.DatabaseForTest; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.Permission; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.ResourceResponseValidator; +import com.azure.cosmos.internal.TestConfigurations; +import com.azure.cosmos.internal.TestSuiteBase; +import com.azure.cosmos.internal.TestUtils; +import com.azure.cosmos.internal.User; import org.apache.commons.lang3.StringUtils; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Factory; -import org.testng.annotations.Test; import org.testng.annotations.Ignore; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/SimpleSerializationTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/SimpleSerializationTest.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/SimpleSerializationTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/SimpleSerializationTest.java index 058fbc86cc25..fbe6856dcdec 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/SimpleSerializationTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/SimpleSerializationTest.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; +package com.azure.cosmos.rx; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.CosmosAsyncContainer; -import com.azure.data.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosClientBuilder; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonMappingException; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/SinglePartitionDocumentQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/SinglePartitionDocumentQueryTest.java similarity index 94% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/SinglePartitionDocumentQueryTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/SinglePartitionDocumentQueryTest.java index de272e8da503..ba395cea6a02 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/SinglePartitionDocumentQueryTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/SinglePartitionDocumentQueryTest.java @@ -1,20 +1,29 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.FailureValidator; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.FeedResponseValidator; -import com.azure.data.cosmos.internal.TestUtils; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.SqlParameter; +import com.azure.cosmos.SqlParameterList; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; +import com.azure.cosmos.internal.TestUtils; import io.reactivex.subscribers.TestSubscriber; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/SinglePartitionReadFeedDocumentsTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/SinglePartitionReadFeedDocumentsTest.java similarity index 88% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/SinglePartitionReadFeedDocumentsTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/SinglePartitionReadFeedDocumentsTest.java index 50cc9eea486b..8a422c76a94f 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/SinglePartitionReadFeedDocumentsTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/SinglePartitionReadFeedDocumentsTest.java @@ -1,11 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; +package com.azure.cosmos.rx; -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.FeedResponseValidator; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/StoredProcedureCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/StoredProcedureCrudTest.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/StoredProcedureCrudTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/StoredProcedureCrudTest.java index 276d2c10ac0c..71ced0eb9224 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/StoredProcedureCrudTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/StoredProcedureCrudTest.java @@ -1,10 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.FailureValidator; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncStoredProcedure; +import com.azure.cosmos.CosmosAsyncStoredProcedureResponse; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosResponseValidator; +import com.azure.cosmos.CosmosStoredProcedureProperties; +import com.azure.cosmos.CosmosStoredProcedureRequestOptions; +import com.azure.cosmos.internal.FailureValidator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/StoredProcedureQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/StoredProcedureQueryTest.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/StoredProcedureQueryTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/StoredProcedureQueryTest.java index 60a5b3cb7c0d..1626f2a90059 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/StoredProcedureQueryTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/StoredProcedureQueryTest.java @@ -1,17 +1,22 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncContainer; -import com.azure.data.cosmos.internal.FailureValidator; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.FeedResponseValidator; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosStoredProcedureProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/StoredProcedureUpsertReplaceTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/StoredProcedureUpsertReplaceTest.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/StoredProcedureUpsertReplaceTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/StoredProcedureUpsertReplaceTest.java index 441c953d63ee..305046bffcf7 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/StoredProcedureUpsertReplaceTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/StoredProcedureUpsertReplaceTest.java @@ -1,14 +1,22 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; +package com.azure.cosmos.rx; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncStoredProcedure; +import com.azure.cosmos.CosmosAsyncStoredProcedureResponse; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosResponseValidator; +import com.azure.cosmos.CosmosStoredProcedureProperties; +import com.azure.cosmos.CosmosStoredProcedureRequestOptions; +import com.azure.cosmos.PartitionKey; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Mono; import java.util.UUID; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TestSuiteBase.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TestSuiteBase.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TestSuiteBase.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TestSuiteBase.java index a91724c4597b..b8bc3130f902 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TestSuiteBase.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TestSuiteBase.java @@ -1,18 +1,54 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.Configs; -import com.azure.data.cosmos.internal.FailureValidator; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.PathParser; -import com.azure.data.cosmos.internal.TestConfigurations; -import com.azure.data.cosmos.internal.Utils; -import com.azure.data.cosmos.internal.directconnectivity.Protocol; -import com.azure.data.cosmos.CosmosClient; -import com.azure.data.cosmos.CosmosDatabase; +package com.azure.cosmos.rx; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CompositePath; +import com.azure.cosmos.CompositePathSortOrder; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncClientTest; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosAsyncDatabaseResponse; +import com.azure.cosmos.CosmosAsyncItem; +import com.azure.cosmos.CosmosAsyncItemResponse; +import com.azure.cosmos.CosmosAsyncUser; +import com.azure.cosmos.CosmosBridgeInternal; +import com.azure.cosmos.CosmosClient; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosContainerProperties; +import com.azure.cosmos.CosmosContainerRequestOptions; +import com.azure.cosmos.CosmosDatabase; +import com.azure.cosmos.CosmosDatabaseForTest; +import com.azure.cosmos.CosmosDatabaseProperties; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosKeyCredential; +import com.azure.cosmos.CosmosResponse; +import com.azure.cosmos.CosmosResponseValidator; +import com.azure.cosmos.CosmosStoredProcedureRequestOptions; +import com.azure.cosmos.CosmosUserProperties; +import com.azure.cosmos.DataType; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.IncludedPath; +import com.azure.cosmos.Index; +import com.azure.cosmos.IndexingPolicy; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.Resource; +import com.azure.cosmos.RetryOptions; +import com.azure.cosmos.SqlQuerySpec; +import com.azure.cosmos.internal.Configs; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.PathParser; +import com.azure.cosmos.internal.TestConfigurations; +import com.azure.cosmos.internal.Utils; +import com.azure.cosmos.internal.directconnectivity.Protocol; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -39,8 +75,8 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.azure.data.cosmos.BridgeInternal.extractConfigs; -import static com.azure.data.cosmos.BridgeInternal.injectConfigs; +import static com.azure.cosmos.BridgeInternal.extractConfigs; +import static com.azure.cosmos.BridgeInternal.injectConfigs; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.spy; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TokenResolverTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TokenResolverTest.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TokenResolverTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TokenResolverTest.java index a5a4b96541f5..53a7818e88af 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TokenResolverTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TokenResolverTest.java @@ -1,33 +1,43 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.internal.AsyncDocumentClient; -import com.azure.data.cosmos.BridgeInternal; -import com.azure.data.cosmos.ChangeFeedOptions; -import com.azure.data.cosmos.ConnectionMode; -import com.azure.data.cosmos.ConnectionPolicy; -import com.azure.data.cosmos.ConsistencyLevel; -import com.azure.data.cosmos.CosmosResourceType; -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.FeedOptions; -import com.azure.data.cosmos.FeedResponse; -import com.azure.data.cosmos.PartitionKey; -import com.azure.data.cosmos.internal.*; -import com.azure.data.cosmos.PermissionMode; -import com.azure.data.cosmos.Resource; -import com.azure.data.cosmos.TokenResolver; -import com.azure.data.cosmos.internal.TestSuiteBase; +package com.azure.cosmos.rx; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.ChangeFeedOptions; +import com.azure.cosmos.ConnectionMode; +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosResourceType; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PermissionMode; +import com.azure.cosmos.Resource; +import com.azure.cosmos.TokenResolver; +import com.azure.cosmos.internal.AsyncDocumentClient; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.Document; +import com.azure.cosmos.internal.DocumentCollection; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.Permission; +import com.azure.cosmos.internal.RequestOptions; +import com.azure.cosmos.internal.ResourceResponse; +import com.azure.cosmos.internal.ResourceResponseValidator; +import com.azure.cosmos.internal.StoredProcedure; +import com.azure.cosmos.internal.StoredProcedureResponse; +import com.azure.cosmos.internal.TestConfigurations; +import com.azure.cosmos.internal.TestSuiteBase; +import com.azure.cosmos.internal.User; import org.testng.SkipException; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Factory; -import org.testng.annotations.Test; import org.testng.annotations.Ignore; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.time.OffsetDateTime; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TopQueryTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TopQueryTests.java similarity index 93% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TopQueryTests.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TopQueryTests.java index 1519fae23722..47f753b17395 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TopQueryTests.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TopQueryTests.java @@ -1,19 +1,25 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.RetryAnalyzer; -import com.azure.data.cosmos.internal.Utils.ValueHolder; -import com.azure.data.cosmos.internal.query.TakeContinuationToken; +package com.azure.cosmos.rx; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.RetryAnalyzer; +import com.azure.cosmos.internal.Utils.ValueHolder; +import com.azure.cosmos.internal.query.TakeContinuationToken; import io.reactivex.subscribers.TestSubscriber; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TriggerCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerCrudTest.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TriggerCrudTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerCrudTest.java index c1df35d4b3b0..9709f65026b3 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TriggerCrudTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerCrudTest.java @@ -1,14 +1,21 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncTrigger; +import com.azure.cosmos.CosmosAsyncTriggerResponse; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosResponseValidator; +import com.azure.cosmos.CosmosTriggerProperties; +import com.azure.cosmos.TriggerOperation; +import com.azure.cosmos.TriggerType; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Mono; import java.util.UUID; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TriggerQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerQueryTest.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TriggerQueryTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerQueryTest.java index d98a7658fcfb..3020a12afd8e 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TriggerQueryTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerQueryTest.java @@ -1,17 +1,25 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.FailureValidator; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.FeedResponseValidator; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosTriggerProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.Resource; +import com.azure.cosmos.TriggerOperation; +import com.azure.cosmos.TriggerType; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TriggerUpsertReplaceTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerUpsertReplaceTest.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TriggerUpsertReplaceTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerUpsertReplaceTest.java index 9d22571b2f3f..ecc66a24b431 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/TriggerUpsertReplaceTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerUpsertReplaceTest.java @@ -1,14 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; +package com.azure.cosmos.rx; -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncTriggerResponse; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosResponseValidator; +import com.azure.cosmos.CosmosTriggerProperties; +import com.azure.cosmos.TriggerOperation; +import com.azure.cosmos.TriggerType; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Mono; import java.util.UUID; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UniqueIndexTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UniqueIndexTest.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UniqueIndexTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UniqueIndexTest.java index db5c3bacfa40..31a9c5b3558a 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UniqueIndexTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UniqueIndexTest.java @@ -1,12 +1,31 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.HttpConstants; -import com.azure.data.cosmos.internal.TestConfigurations; -import com.azure.data.cosmos.internal.Utils; +package com.azure.cosmos.rx; + +import com.azure.cosmos.ConnectionPolicy; +import com.azure.cosmos.ConsistencyLevel; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosAsyncItem; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosContainerProperties; +import com.azure.cosmos.CosmosDatabaseForTest; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.DataType; +import com.azure.cosmos.ExcludedPath; +import com.azure.cosmos.HashIndex; +import com.azure.cosmos.IncludedPath; +import com.azure.cosmos.IndexingMode; +import com.azure.cosmos.IndexingPolicy; +import com.azure.cosmos.PartitionKey; +import com.azure.cosmos.PartitionKeyDefinition; +import com.azure.cosmos.UniqueKey; +import com.azure.cosmos.UniqueKeyPolicy; +import com.azure.cosmos.internal.HttpConstants; +import com.azure.cosmos.internal.TestConfigurations; +import com.azure.cosmos.internal.Utils; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UserCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserCrudTest.java similarity index 92% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UserCrudTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserCrudTest.java index 94e34b30874c..9eebaf8dc8e5 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UserCrudTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserCrudTest.java @@ -1,11 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import com.azure.data.cosmos.internal.FailureValidator; +package com.azure.cosmos.rx; + + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosAsyncUser; +import com.azure.cosmos.CosmosAsyncUserResponse; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosDatabaseForTest; +import com.azure.cosmos.CosmosResponseValidator; +import com.azure.cosmos.CosmosUserProperties; +import com.azure.cosmos.internal.FailureValidator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UserDefinedFunctionCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserDefinedFunctionCrudTest.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UserDefinedFunctionCrudTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserDefinedFunctionCrudTest.java index 3159d8ee6b4f..ad93c4e0f92b 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UserDefinedFunctionCrudTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserDefinedFunctionCrudTest.java @@ -1,9 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncContainer; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncUserDefinedFunction; +import com.azure.cosmos.CosmosAsyncUserDefinedFunctionResponse; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosResponseValidator; +import com.azure.cosmos.CosmosUserDefinedFunctionProperties; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UserDefinedFunctionQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserDefinedFunctionQueryTest.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UserDefinedFunctionQueryTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserDefinedFunctionQueryTest.java index ab2c0f46675c..e01b83b6087d 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UserDefinedFunctionQueryTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserDefinedFunctionQueryTest.java @@ -1,19 +1,24 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncContainer; -import com.azure.data.cosmos.internal.Database; -import com.azure.data.cosmos.internal.FailureValidator; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.FeedResponseValidator; -import com.azure.data.cosmos.internal.TestUtils; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosClientException; +import com.azure.cosmos.CosmosUserDefinedFunctionProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.Database; +import com.azure.cosmos.internal.FailureValidator; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; +import com.azure.cosmos.internal.TestUtils; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UserDefinedFunctionUpsertReplaceTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserDefinedFunctionUpsertReplaceTest.java similarity index 90% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UserDefinedFunctionUpsertReplaceTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserDefinedFunctionUpsertReplaceTest.java index 886cb6116c68..e77fb4a42ed7 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UserDefinedFunctionUpsertReplaceTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserDefinedFunctionUpsertReplaceTest.java @@ -1,14 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncUserDefinedFunctionResponse; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosResponseValidator; +import com.azure.cosmos.CosmosUserDefinedFunctionProperties; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Mono; import java.util.UUID; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UserQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserQueryTest.java similarity index 91% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UserQueryTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserQueryTest.java index 78a3ec7bcb85..be480649acd6 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/UserQueryTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserQueryTest.java @@ -1,18 +1,23 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncDatabase; -import com.azure.data.cosmos.internal.FeedResponseListValidator; -import com.azure.data.cosmos.internal.FeedResponseValidator; -import com.azure.data.cosmos.internal.TestUtils; +package com.azure.cosmos.rx; + +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncDatabase; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosDatabaseForTest; +import com.azure.cosmos.CosmosUserProperties; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; +import com.azure.cosmos.internal.FeedResponseListValidator; +import com.azure.cosmos.internal.FeedResponseValidator; +import com.azure.cosmos.internal.TestUtils; import org.apache.commons.lang3.StringUtils; -import org.testng.annotations.Factory; -import org.testng.annotations.Test; -import org.testng.annotations.Ignore; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; import reactor.core.publisher.Flux; import java.util.ArrayList; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/VeryLargeDocumentQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/VeryLargeDocumentQueryTest.java similarity index 89% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/VeryLargeDocumentQueryTest.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/VeryLargeDocumentQueryTest.java index 9ec1bb92a013..20d30981d918 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/VeryLargeDocumentQueryTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/VeryLargeDocumentQueryTest.java @@ -1,15 +1,22 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx; - -import com.azure.data.cosmos.*; -import com.azure.data.cosmos.CosmosAsyncClient; +package com.azure.cosmos.rx; + +import com.azure.cosmos.BridgeInternal; +import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncContainer; +import com.azure.cosmos.CosmosAsyncItemResponse; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.CosmosItemProperties; +import com.azure.cosmos.CosmosItemRequestOptions; +import com.azure.cosmos.FeedOptions; +import com.azure.cosmos.FeedResponse; import org.apache.commons.lang3.StringUtils; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Factory; import org.testng.annotations.Ignore; import org.testng.annotations.Test; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.AfterClass; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/proxy/HttpProxyChannelInitializer.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/proxy/HttpProxyChannelInitializer.java similarity index 95% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/proxy/HttpProxyChannelInitializer.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/proxy/HttpProxyChannelInitializer.java index 66664f0be072..5606d59ef703 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/proxy/HttpProxyChannelInitializer.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/proxy/HttpProxyChannelInitializer.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.proxy; +package com.azure.cosmos.rx.proxy; import io.netty.channel.ChannelInitializer; import io.netty.channel.socket.SocketChannel; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/proxy/HttpProxyClientHandler.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/proxy/HttpProxyClientHandler.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/proxy/HttpProxyClientHandler.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/proxy/HttpProxyClientHandler.java index 3ac6fd128708..79bfbc76336e 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/proxy/HttpProxyClientHandler.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/proxy/HttpProxyClientHandler.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.proxy; +package com.azure.cosmos.rx.proxy; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/proxy/HttpProxyClientHeader.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/proxy/HttpProxyClientHeader.java similarity index 98% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/proxy/HttpProxyClientHeader.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/proxy/HttpProxyClientHeader.java index 0b1edb777024..d300cbaa5337 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/proxy/HttpProxyClientHeader.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/proxy/HttpProxyClientHeader.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.proxy; +package com.azure.cosmos.rx.proxy; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/proxy/HttpProxyRemoteHandler.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/proxy/HttpProxyRemoteHandler.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/proxy/HttpProxyRemoteHandler.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/proxy/HttpProxyRemoteHandler.java index 414a50bf8640..487aa265d104 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/proxy/HttpProxyRemoteHandler.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/proxy/HttpProxyRemoteHandler.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.proxy; +package com.azure.cosmos.rx.proxy; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/proxy/HttpProxyServer.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/proxy/HttpProxyServer.java similarity index 97% rename from sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/proxy/HttpProxyServer.java rename to sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/proxy/HttpProxyServer.java index 0723829d9f28..763859125b6d 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/proxy/HttpProxyServer.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/proxy/HttpProxyServer.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.cosmos.rx.proxy; +package com.azure.cosmos.rx.proxy; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.EventLoopGroup; diff --git a/sdk/cosmos/azure-cosmos/src/test/resources/emulator-testng.xml b/sdk/cosmos/azure-cosmos/src/test/resources/emulator-testng.xml index 16bec3b3b396..042b8527fef4 100644 --- a/sdk/cosmos/azure-cosmos/src/test/resources/emulator-testng.xml +++ b/sdk/cosmos/azure-cosmos/src/test/resources/emulator-testng.xml @@ -29,7 +29,7 @@ - + diff --git a/sdk/cosmos/azure-cosmos/src/test/resources/fast-testng.xml b/sdk/cosmos/azure-cosmos/src/test/resources/fast-testng.xml index b78fb1cab325..10c2c47b59b7 100644 --- a/sdk/cosmos/azure-cosmos/src/test/resources/fast-testng.xml +++ b/sdk/cosmos/azure-cosmos/src/test/resources/fast-testng.xml @@ -29,7 +29,7 @@ - + diff --git a/sdk/cosmos/azure-cosmos/src/test/resources/long-testng.xml b/sdk/cosmos/azure-cosmos/src/test/resources/long-testng.xml index debd90ba2136..3bb293f53fb8 100644 --- a/sdk/cosmos/azure-cosmos/src/test/resources/long-testng.xml +++ b/sdk/cosmos/azure-cosmos/src/test/resources/long-testng.xml @@ -29,7 +29,7 @@ - + From 4fbf75cc7bdf337ef5a112484a4ac139fa2fd22d Mon Sep 17 00:00:00 2001 From: Bhaskar Mallapragada Date: Thu, 24 Oct 2019 15:17:30 -0700 Subject: [PATCH 2/4] updating the cosmos benchmark readme path after package name change --- eng/.docsettings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/.docsettings.yml b/eng/.docsettings.yml index 4fb91b2a5c7e..5786303adf5d 100644 --- a/eng/.docsettings.yml +++ b/eng/.docsettings.yml @@ -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'] From 723067b93d5d29449f99e485d389558456c972bc Mon Sep 17 00:00:00 2001 From: Bhaskar Mallapragada Date: Thu, 24 Oct 2019 16:09:11 -0700 Subject: [PATCH 3/4] updating the cosmos readme path after package name change --- eng/.docsettings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/.docsettings.yml b/eng/.docsettings.yml index 5786303adf5d..e571196f78bd 100644 --- a/eng/.docsettings.yml +++ b/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'] From 029072dace946eb174be812841414f77d5cb9b72 Mon Sep 17 00:00:00 2001 From: Bhaskar Mallapragada Date: Thu, 24 Oct 2019 16:43:48 -0700 Subject: [PATCH 4/4] Setting the correct version for v4 preview release: 4.0.0-preview.1 --- sdk/cosmos/azure-cosmos-benchmark/pom.xml | 6 +++--- sdk/cosmos/azure-cosmos-examples/pom.xml | 6 +++--- sdk/cosmos/azure-cosmos/pom.xml | 4 ++-- .../main/java/com/azure/cosmos/internal/HttpConstants.java | 2 +- sdk/cosmos/pom.xml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sdk/cosmos/azure-cosmos-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-benchmark/pom.xml index 62e7ad77d07d..71840f39c2fd 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/pom.xml +++ b/sdk/cosmos/azure-cosmos-benchmark/pom.xml @@ -8,12 +8,12 @@ Licensed under the MIT License. com.azure azure-cosmos-parent - 4.0.0-preview.4 + 4.0.0-preview.1 com.azure azure-cosmos-benchmark - 4.0.0-preview.4 + 4.0.0-preview.1 Microsoft Azure SDK for SQL API of Azure Cosmos DB Service - Benchmarking tool This package contains Benchmarking tool for Microsoft Azure SDK for SQL API of Azure Cosmos DB Service https://github.com/Azure/azure-sdk-for-java @@ -33,7 +33,7 @@ Licensed under the MIT License. com.azure azure-cosmos - 4.0.0-preview.4 + 4.0.0-preview.1 diff --git a/sdk/cosmos/azure-cosmos-examples/pom.xml b/sdk/cosmos/azure-cosmos-examples/pom.xml index 2f7475806281..9b79ec23ef58 100644 --- a/sdk/cosmos/azure-cosmos-examples/pom.xml +++ b/sdk/cosmos/azure-cosmos-examples/pom.xml @@ -8,12 +8,12 @@ Licensed under the MIT License. com.azure azure-cosmos-parent - 4.0.0-preview.4 + 4.0.0-preview.1 com.azure azure-cosmos-examples - 4.0.0-preview.4 + 4.0.0-preview.1 Microsoft Azure SDK for SQL API of Azure Cosmos DB Service - Examples This package contains examples for Microsoft Azure SDK for SQL API of Azure Cosmos DB Service https://github.com/Azure/azure-sdk-for-java @@ -89,7 +89,7 @@ Licensed under the MIT License. com.azure azure-cosmos - 4.0.0-preview.4 + 4.0.0-preview.1 diff --git a/sdk/cosmos/azure-cosmos/pom.xml b/sdk/cosmos/azure-cosmos/pom.xml index f2ccf2bbeaae..1f39d92d52c6 100644 --- a/sdk/cosmos/azure-cosmos/pom.xml +++ b/sdk/cosmos/azure-cosmos/pom.xml @@ -7,12 +7,12 @@ Licensed under the MIT License. com.azure azure-cosmos-parent - 4.0.0-preview.4 + 4.0.0-preview.1 com.azure azure-cosmos - 4.0.0-preview.4 + 4.0.0-preview.1 Microsoft Azure SDK for SQL API of Azure Cosmos DB Service This Package contains Microsoft Azure Cosmos SDK (with Reactive Extension rx support) for Azure Cosmos DB SQL API jar diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/HttpConstants.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/HttpConstants.java index 2d23d579fc7e..6afcbdf58cba 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/HttpConstants.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/internal/HttpConstants.java @@ -252,7 +252,7 @@ public static class Versions { // TODO: FIXME we can use maven plugin for generating a version file // @see // https://stackoverflow.com/questions/2469922/generate-a-version-java-file-in-maven - public static final String SDK_VERSION = "4.0.0-preview.4"; + public static final String SDK_VERSION = "4.0.0-preview.1"; public static final String SDK_NAME = "cosmosdb-java-sdk"; } diff --git a/sdk/cosmos/pom.xml b/sdk/cosmos/pom.xml index 98e978d1d509..d250cd128a1e 100644 --- a/sdk/cosmos/pom.xml +++ b/sdk/cosmos/pom.xml @@ -13,7 +13,7 @@ Licensed under the MIT License. com.azure azure-cosmos-parent - 4.0.0-preview.4 + 4.0.0-preview.1 pom Microsoft Azure Cosmos DB SQL API @@ -55,7 +55,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos - 4.0.0-preview.4 + 4.0.0-preview.1