Renamed azure-spring-data-cosmosdb to azure-spring-data-cosmos (Azure…

…#12881) * Renamed azure-spring-data-cosmosdb to azure-spring-data-cosmos. Renamed directory structure and package structure to track 2 structure * Fixed changelog version, contributing path * Updating tests.yml * Reverted safeName change and will update it in part 2
FabianMeiswinkel · Jul 8, 2020 · 2a3e40b · 2a3e40b
1 parent 3df5560
commit 2a3e40b
Show file tree

Hide file tree

Showing 210 changed files with 854 additions and 856 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -17,7 +17,7 @@
 /sdk/core/                                          @alzimmermsft @jianghaolu @srnagar @hemanttanwar @anuchandy
 /sdk/core/azure-core-tracing-opentelemetry/         @samvaity @alzimmermsft
 /sdk/cosmos/                                        @moderakh @kushagraThapar @David-Noble-at-work @kirankumarkolli @mbhaskar
-/sdk/cosmos/azure-spring-data-cosmosdb/             @kushagraThapar @saragluna @yiliuTo @chenrujun @zhoufenqin @jialindai
+/sdk/cosmos/azure-spring-data-cosmos/               @kushagraThapar @saragluna @yiliuTo @chenrujun @zhoufenqin @jialindai
 /sdk/eventhubs/                                     @conniey @srnagar @mssfang
 /sdk/formrecognizer/                                @samvaity @mssfang @sima-zhu
 /sdk/identity/                                      @schaabs @g2vinay @jianghaolu

diff --git a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
@@ -474,9 +474,9 @@
   <suppress checks="AvoidNestedBlocks" files="com.azure.storage.internal.avro.implementation.schema.AvroSchema.java"/>
   <suppress checks="AvoidNestedBlocks" files="com.azure.storage.internal.avro.implementation.schema.AvroType.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck"
-            files="com.microsoft.azure.spring.data.cosmosdb.config.AbstractCosmosConfiguration.java"/>
+            files="com.azure.spring.data.cosmos.config.AbstractCosmosConfiguration.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck"
-            files="com.microsoft.azure.spring.data.cosmosdb.core.query.CosmosPageRequest.java"/>
+            files="com.azure.spring.data.cosmos.core.query.CosmosPageRequest.java"/>
 
   <!-- Checkstyle suppressions for azure-test-watch package -->
   <suppress checks="com.azure.tools.checkstyle.checks.ExternalDependencyExposedCheck" files="com.azure.testing.AzureTestWatcher.java"/>
@@ -485,9 +485,9 @@
   <!-- Checkstyle suppressions for resource manager package -->
   <suppress checks="com.azure.tools.checkstyle.checks.ServiceClientCheck" files="com.azure.resourcemanager.*"/>
 
-  <!-- Checkstyle suppressions for spring-data-cosmosdb package -->
-  <suppress checks="com.azure.tools.checkstyle.checks.GoodLoggingCheck|ExternalDependencyExposedCheck|ThrowFromClientLoggerCheck" files="com.microsoft.azure.spring.data.cosmosdb.*\.java"/>
-  <suppress checks="MethodName|MemberName|ParameterName|VisibilityModifier" files="com.microsoft.azure.spring.data.cosmosdb.domain|repository|config.*\.java"/>
-  <suppress checks="ConstantName" files="com.microsoft.azure.spring.data.cosmosdb.repository|common.*\.java" />
+  <!-- Checkstyle suppressions for azure-spring-data-cosmos package -->
+  <suppress checks="com.azure.tools.checkstyle.checks.GoodLoggingCheck|ExternalDependencyExposedCheck|ThrowFromClientLoggerCheck" files="com.azure.spring.data.cosmos.*\.java"/>
+  <suppress checks="MethodName|MemberName|ParameterName|VisibilityModifier" files="com.azure.spring.data.cosmos.domain|repository|config.*\.java"/>
+  <suppress checks="ConstantName" files="com.azure.spring.data.cosmos.repository|common.*\.java" />
 
 </suppressions>
diff --git a/eng/code-quality-reports/src/main/resources/revapi/revapi.json b/eng/code-quality-reports/src/main/resources/revapi/revapi.json
@@ -16,7 +16,9 @@
             "com\\.microsoft\\.spring\\..+",
             "javax\\.jms(\\..+)?",
             "javax\\.servlet(\\..+)?",
-            "io\\.micrometer(\\..+)?"
+            "io\\.micrometer(\\..+)?",
+            "com\\.azure\\.data\\.cosmos(\\..+)?",
+            "com\\.azure\\.spring\\.data\\.cosmos\\..+"
           ]
         }
       }

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
@@ -276,7 +276,7 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>spring-data-cosmosdb</artifactId>
-      <version>2.3.1-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-data-cosmosdb;current} -->
+      <version>3.0.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-data-cosmosdb;current} -->
     </dependency>
   </dependencies>
   <build>

diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
@@ -60,7 +60,7 @@ com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-spring-boot-metrics-starter;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-spring-boot-tests;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-spring-boot-test-core;2.3.2;2.3.3-beta.1
-com.microsoft.azure:spring-data-cosmosdb;2.3.0;2.3.1-beta.1
+com.microsoft.azure:spring-data-cosmosdb;3.0.0-beta.1;3.0.0-beta.1
 
 # Unreleased dependencies: Copy the entry from above, prepend "unreleased_" and remove the current
 # version. Unreleased dependencies are only valid for dependency versions.

diff --git a/sdk/cosmos/azure-spring-data-cosmos/CHANGELOG.md b/sdk/cosmos/azure-spring-data-cosmos/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Release History
+
+## 3.0.0-beta.1 (Unreleased)
diff --git a/...zure-spring-data-cosmosdb/Contributing.md → .../azure-spring-data-cosmos/Contributing.md b/...zure-spring-data-cosmosdb/Contributing.md → .../azure-spring-data-cosmos/Contributing.md
@@ -10,7 +10,7 @@ To build the project, run maven commands.
 
 ```bash
 git clone https://github.com/Azure/azure-sdk-for-java.git 
-cd sdk/cosmos/azure-spring-data-cosmosdb
+cd sdk/cosmos/azure-spring-data-cosmos
 mvnw clean install
 ```
 
@@ -19,7 +19,7 @@ There're integration tests on azure and on emulator to trigger integration test
 
 - Run unit tests
 ```bash
-mvnw clean install
+mvn clean install -Dgpg.skip
 ```
 
 - Run integration tests
@@ -52,7 +52,7 @@ mvnw clean install
 
 - Skip tests execution
 ```bash
-mvnw clean install -DskipTests
+mvn clean install -Dgpg.skip-DskipTests
 ```
 
 ## Version management

diff --git a/...smos/azure-spring-data-cosmosdb/README.md → ...cosmos/azure-spring-data-cosmos/README.md b/...smos/azure-spring-data-cosmosdb/README.md → ...cosmos/azure-spring-data-cosmos/README.md
diff --git a/...cosmos/azure-spring-data-cosmosdb/pom.xml → sdk/cosmos/azure-spring-data-cosmos/pom.xml b/...cosmos/azure-spring-data-cosmosdb/pom.xml → sdk/cosmos/azure-spring-data-cosmos/pom.xml
@@ -12,18 +12,18 @@
 
   <groupId>com.microsoft.azure</groupId>
   <artifactId>spring-data-cosmosdb</artifactId>
-  <version>2.3.1-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-data-cosmosdb;current} -->
+  <version>3.0.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-data-cosmosdb;current} -->
   <packaging>jar</packaging>
   <name>Spring Data for Azure Cosmos DB SQL API</name>
   <description>Spring Data for Azure Cosmos DB SQL API</description>
-  <url>https://github.com/Microsoft/spring-data-cosmosdb</url>
+  <url>https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos</url>
 
   <properties>
     <maven.build.timestamp.format>MM-dd-HH-mm-ss</maven.build.timestamp.format>
     <jacoco.min.branchcoverage>0.17</jacoco.min.branchcoverage>
     <jacoco.min.linecoverage>0.18</jacoco.min.linecoverage>
 
-    <azure.test.resourcegroup>spring-data-cosmosdb-test</azure.test.resourcegroup>
+    <azure.test.resourcegroup>azure-spring-data-cosmos-test</azure.test.resourcegroup>
     <azure.test.dbname>testdb-${maven.build.timestamp}</azure.test.dbname>
     <skip.integration.tests>true</skip.integration.tests>
     <test.on.azure>false</test.on.azure>
@@ -238,7 +238,7 @@
         <version>3.1.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
         <configuration>
           <sourceFileExcludes>
-            <sourceFileExclude>com/microsoft/azure/spring/data/cosmosdb/core/mapping/BasicCosmosPersistentProperty.java</sourceFileExclude>
+            <sourceFileExclude>com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentProperty.java</sourceFileExclude>
           </sourceFileExcludes>
           <additionalDependencies>
             <additionalDependency>

diff --git a/...azure/spring/data/cosmosdb/Constants.java → ...m/azure/spring/data/cosmos/Constants.java b/...azure/spring/data/cosmosdb/Constants.java → ...m/azure/spring/data/cosmos/Constants.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.azure.spring.data.cosmosdb;
+package com.azure.spring.data.cosmos;
 
 import com.azure.data.cosmos.IndexingMode;
 

diff --git a/...spring/data/cosmosdb/CosmosDbFactory.java → ...e/spring/data/cosmos/CosmosDbFactory.java b/...spring/data/cosmosdb/CosmosDbFactory.java → ...e/spring/data/cosmos/CosmosDbFactory.java
@@ -1,15 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.microsoft.azure.spring.data.cosmosdb;
+package com.azure.spring.data.cosmos;
 
 import com.azure.data.cosmos.ConnectionPolicy;
 import com.azure.data.cosmos.CosmosClient;
 import com.azure.data.cosmos.sync.CosmosSyncClient;
-import com.microsoft.azure.spring.data.cosmosdb.common.MacAddress;
-import com.microsoft.azure.spring.data.cosmosdb.common.PropertyLoader;
-import com.microsoft.azure.spring.data.cosmosdb.common.TelemetrySender;
-import com.microsoft.azure.spring.data.cosmosdb.config.CosmosDBConfig;
+import com.azure.spring.data.cosmos.common.MacAddress;
+import com.azure.spring.data.cosmos.common.PropertyLoader;
+import com.azure.spring.data.cosmos.common.TelemetrySender;
+import com.azure.spring.data.cosmos.config.CosmosDBConfig;
 import org.springframework.lang.NonNull;
 
 import org.springframework.util.Assert;

diff --git a/...g/data/cosmosdb/common/CosmosdbUtils.java → ...ing/data/cosmos/common/CosmosdbUtils.java b/...g/data/cosmosdb/common/CosmosdbUtils.java → ...ing/data/cosmos/common/CosmosdbUtils.java
@@ -1,17 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.azure.spring.data.cosmosdb.common;
+package com.azure.spring.data.cosmos.common;
 
 import com.azure.data.cosmos.CosmosResponse;
 import com.azure.data.cosmos.CosmosResponseDiagnostics;
 import com.azure.data.cosmos.FeedResponse;
 import com.azure.data.cosmos.FeedResponseDiagnostics;
 import com.azure.data.cosmos.Resource;
+import com.azure.spring.data.cosmos.core.convert.ObjectMapperFactory;
+import com.azure.spring.data.cosmos.exception.ConfigurationException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.microsoft.azure.spring.data.cosmosdb.core.ResponseDiagnostics;
-import com.microsoft.azure.spring.data.cosmosdb.core.ResponseDiagnosticsProcessor;
-import com.microsoft.azure.spring.data.cosmosdb.core.convert.ObjectMapperFactory;
-import com.microsoft.azure.spring.data.cosmosdb.exception.ConfigurationException;
+import com.azure.spring.data.cosmos.core.ResponseDiagnostics;
+import com.azure.spring.data.cosmos.core.ResponseDiagnosticsProcessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.lang.NonNull;

diff --git a/...a/cosmosdb/common/ExpressionResolver.java → ...ata/cosmos/common/ExpressionResolver.java b/...a/cosmosdb/common/ExpressionResolver.java → ...ata/cosmos/common/ExpressionResolver.java
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.microsoft.azure.spring.data.cosmosdb.common;
+package com.azure.spring.data.cosmos.common;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;

diff --git a/...ring/data/cosmosdb/common/MacAddress.java → ...spring/data/cosmos/common/MacAddress.java b/...ring/data/cosmosdb/common/MacAddress.java → ...spring/data/cosmos/common/MacAddress.java
@@ -7,7 +7,7 @@
  *      Location in the repo: /Utils/azuretools-core/src/com/microsoft/azuretools/azurecommons/util/MacAddress.java
  */
 
-package com.microsoft.azure.spring.data.cosmosdb.common;
+package com.azure.spring.data.cosmos.common;
 
 import org.springframework.lang.NonNull;
 import org.springframework.util.Assert;

diff --git a/...spring/data/cosmosdb/common/Memoizer.java → ...e/spring/data/cosmos/common/Memoizer.java b/...spring/data/cosmosdb/common/Memoizer.java → ...e/spring/data/cosmos/common/Memoizer.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.azure.spring.data.cosmosdb.common;
+package com.azure.spring.data.cosmos.common;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/.../data/cosmosdb/common/PropertyLoader.java → ...ng/data/cosmos/common/PropertyLoader.java b/.../data/cosmosdb/common/PropertyLoader.java → ...ng/data/cosmos/common/PropertyLoader.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.azure.spring.data.cosmosdb.common;
+package com.azure.spring.data.cosmos.common;
 
 import org.springframework.lang.NonNull;
 

diff --git a/...a/cosmosdb/common/TelemetryEventData.java → ...ata/cosmos/common/TelemetryEventData.java b/...a/cosmosdb/common/TelemetryEventData.java → ...ata/cosmos/common/TelemetryEventData.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.azure.spring.data.cosmosdb.common;
+package com.azure.spring.data.cosmos.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.springframework.lang.NonNull;

diff --git a/...data/cosmosdb/common/TelemetrySender.java → ...g/data/cosmos/common/TelemetrySender.java b/...data/cosmosdb/common/TelemetrySender.java → ...g/data/cosmos/common/TelemetrySender.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.azure.spring.data.cosmosdb.common;
+package com.azure.spring.data.cosmos.common;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -33,7 +33,7 @@ public class TelemetrySender {
 
     private static final String PROPERTY_SERVICE_NAME = "serviceName";
 
-    private static final String PROJECT_INFO = "spring-data-cosmosdb/"
+    private static final String PROJECT_INFO = "azure-spring-data-cosmos/"
                                                     + PropertyLoader.getProjectVersion();
 
     private static final String TELEMETRY_TARGET_URL = "https://dc.services.visualstudio.com/v2/track";

diff --git a/...ng/data/cosmosdb/common/package-info.java → ...ring/data/cosmos/common/package-info.java b/...ng/data/cosmosdb/common/package-info.java → ...ring/data/cosmos/common/package-info.java
@@ -4,4 +4,4 @@
 /**
  * This package contains the classes of utils for cosmosdb
  */
-package com.microsoft.azure.spring.data.cosmosdb.common;
+package com.azure.spring.data.cosmos.common;
diff --git a/...b/config/AbstractCosmosConfiguration.java → ...s/config/AbstractCosmosConfiguration.java b/...b/config/AbstractCosmosConfiguration.java → ...s/config/AbstractCosmosConfiguration.java
@@ -1,16 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.microsoft.azure.spring.data.cosmosdb.config;
+package com.azure.spring.data.cosmos.config;
 
 import com.azure.data.cosmos.CosmosClient;
 import com.azure.data.cosmos.sync.CosmosSyncClient;
+import com.azure.spring.data.cosmos.core.convert.MappingCosmosConverter;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.microsoft.azure.spring.data.cosmosdb.Constants;
-import com.microsoft.azure.spring.data.cosmosdb.CosmosDbFactory;
-import com.microsoft.azure.spring.data.cosmosdb.core.CosmosTemplate;
-import com.microsoft.azure.spring.data.cosmosdb.core.ReactiveCosmosTemplate;
-import com.microsoft.azure.spring.data.cosmosdb.core.convert.MappingCosmosConverter;
+import com.azure.spring.data.cosmos.CosmosDbFactory;
+import com.azure.spring.data.cosmos.Constants;
+import com.azure.spring.data.cosmos.core.CosmosTemplate;
+import com.azure.spring.data.cosmos.core.ReactiveCosmosTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;

diff --git a/...db/config/CosmosConfigurationSupport.java → ...os/config/CosmosConfigurationSupport.java b/...db/config/CosmosConfigurationSupport.java → ...os/config/CosmosConfigurationSupport.java
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.microsoft.azure.spring.data.cosmosdb.config;
+package com.azure.spring.data.cosmos.config;
 
-import com.microsoft.azure.spring.data.cosmosdb.common.ExpressionResolver;
-import com.microsoft.azure.spring.data.cosmosdb.core.mapping.CosmosMappingContext;
+import com.azure.spring.data.cosmos.core.mapping.CosmosMappingContext;
+import com.azure.spring.data.cosmos.common.ExpressionResolver;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;

diff --git a/.../data/cosmosdb/config/CosmosDBConfig.java → ...ng/data/cosmos/config/CosmosDBConfig.java b/.../data/cosmosdb/config/CosmosDBConfig.java → ...ng/data/cosmos/config/CosmosDBConfig.java
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.azure.spring.data.cosmosdb.config;
+package com.azure.spring.data.cosmos.config;
 
 import com.azure.data.cosmos.ConnectionPolicy;
 import com.azure.data.cosmos.ConsistencyLevel;
 import com.azure.data.cosmos.CosmosKeyCredential;
 import com.azure.data.cosmos.internal.RequestOptions;
-import com.microsoft.azure.spring.data.cosmosdb.core.ResponseDiagnosticsProcessor;
-import com.microsoft.azure.spring.data.cosmosdb.exception.CosmosDBAccessException;
+import com.azure.spring.data.cosmos.core.ResponseDiagnosticsProcessor;
+import com.azure.spring.data.cosmos.exception.CosmosDBAccessException;
 import org.springframework.util.Assert;
 
 import java.beans.ConstructorProperties;

diff --git a/...ng/data/cosmosdb/config/package-info.java → ...ring/data/cosmos/config/package-info.java b/...ng/data/cosmosdb/config/package-info.java → ...ring/data/cosmos/config/package-info.java
@@ -4,4 +4,4 @@
 /**
  * This package contains the classes to configure properties of cosmos db
  */
-package com.microsoft.azure.spring.data.cosmosdb.config;
+package com.azure.spring.data.cosmos.config;
diff --git a/.../data/cosmosdb/core/CosmosOperations.java → ...ng/data/cosmos/core/CosmosOperations.java b/.../data/cosmosdb/core/CosmosOperations.java → ...ng/data/cosmos/core/CosmosOperations.java
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.microsoft.azure.spring.data.cosmosdb.core;
+package com.azure.spring.data.cosmos.core;
 
 import com.azure.data.cosmos.CosmosContainerProperties;
 import com.azure.data.cosmos.PartitionKey;
-import com.microsoft.azure.spring.data.cosmosdb.core.convert.MappingCosmosConverter;
-import com.microsoft.azure.spring.data.cosmosdb.core.query.DocumentQuery;
-import com.microsoft.azure.spring.data.cosmosdb.repository.support.CosmosEntityInformation;
+import com.azure.spring.data.cosmos.core.convert.MappingCosmosConverter;
+import com.azure.spring.data.cosmos.core.query.DocumentQuery;
+import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Release History

		## 3.0.0-beta.1 (Unreleased)