Migrate spring data cosmos modules to sdk/spring dir #30854

moarychan · 2022-09-08T10:54:39Z

Description

If an SDK is being regenerated based on a new swagger spec, a link to the pull request containing these swagger spec changes has been included above.

All SDK Contribution checklist:

The pull request does not introduce [breaking changes]
CHANGELOG is updated for new features, bug fixes or other significant changes.
I have read the contribution guidelines.

General Guidelines and Best Practices

Title of the pull request is clear and informative.
There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.

Testing Guidelines

Pull request includes test coverage for the included changes.

azure-sdk · 2022-09-08T11:03:56Z

API change check

APIView has identified API level changes in this PR and created following API reviews.

azure-spring-data-cosmos
spring-cloud-azure-autoconfigure
spring-cloud-azure-core
spring-messaging-azure-eventhubs
spring-messaging-azure-servicebus

moarychan · 2022-09-09T08:25:26Z

/azp run java - spring - tests

azure-pipelines · 2022-09-09T08:25:39Z

Azure Pipelines successfully started running 1 pipeline(s).

moarychan · 2022-09-20T10:01:04Z

The below failures will be fixed later:

Some broken links in branch 6.x, maybe a pipeline bug.
Cosmos IT failures, which may be fixed in main branch first.
Ignore the compatibility test for Spring Boot 3.0.0-M3, because the break changes in Spring Data from 3.0.0-M4 to 3.0.0-M5.
This PR is ready to merge, @saragluna please help to review, thanks!

jsquire

Changes to CODEOWNERS and Fabric Bot rules look good to me.

kushagraThapar

@moarychan great work, thanks!

I have added few comments which are worth discussing before we merge this PR.
Regarding your comment on Cosmos IT failures, which may be fixed in main branch first.
There have been no failures regarding CosmosAuditing feature in our CI, and I think the code changes introduced in this PR related to auditing feature are causing the pipeline to fail. Please fix the tests before merging this PR.

kushagraThapar · 2022-09-20T17:24:52Z

eng/versioning/version_client.txt

@@ -143,8 +143,7 @@ com.azure:azure-security-keyvault-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-sdk-template;1.1.1234;1.2.2-beta.1
 com.azure:azure-sdk-template-two;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-sdk-template-three;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-spring-data-cosmos;3.26.0;3.27.0-beta.1
-com.azure:azure-spring-data-cosmos-test;3.0.0-beta.1;3.0.0-beta.1
+com.azure:azure-spring-data-cosmos;6.0.0-beta.1;6.0.0-beta.1


current versions of azure-spring-data-cosmos is v3. Why do we have the version as 6.0.0-beta.1 ?
What is the plan for releasing multiple major versions of azure-spring-data-cosmos?

We can discuss the name of the version in the tmr meeting. The release plan is current milestone 2022-10, after this pr is merged, it will be very soon.

kushagraThapar · 2022-09-20T17:31:47Z

sdk/cosmos/tests.yml

@@ -36,29 +36,3 @@ stages:
 TestGoals: 'verify'
 TestOptions: '$(ProfileFlag) $(AdditionalArgs)'
 TestResultsFiles: '**/junitreports/TEST-*.xml'
-


Why are we removing this? Can't we still run spring-data-cosmos-test integration pipelines on azure-cosmos module development?

+1 - same comment for the ci.yml above. We would still need to compile and run the spring-data-cosmos tests for any changes in azure-cosmos

kushagraThapar · 2022-09-20T17:34:50Z

sdk/spring/azure-spring-data-cosmos/pom.xml

 <dependency>
 <groupId>com.azure</groupId>
 <artifactId>azure-cosmos</artifactId>
- <version>4.36.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+ <version>4.35.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->


We should still depend on current version of azure-cosmos like we do right now, so that we can continuously run the integration tests when we develop azure-cosmos module.
If we don't do this, we won't be able to catch any regressions because of development on azure-cosmos module, which can then only be caught after the azure-cosmos module has been released.

kushagraThapar · 2022-09-20T17:35:43Z

sdk/spring/azure-spring-data-cosmos/pom.xml

@@ -85,10 +85,21 @@
 <artifactId>spring-expression</artifactId>
 <version>6.0.0-M5</version> <!-- {x-version-update;org.springframework:spring-expression;external_dependency} -->
 </dependency>
+ <dependency>
+ <groupId>io.micrometer</groupId>


why do we need micrometer in spring-data-cosmos?

It's used to fix the issue micrometer-metrics/micrometer#3398

But shouldn't it be sufficient to add this as "provided" vs. making it a transitive dependency?

FabianMeiswinkel · 2022-09-21T09:39:01Z

sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md

@@ -123,7 +123,7 @@ or contact [opencode@microsoft.com][coc_contact] with any additional questions o
 [coc_faq]: https://opensource.microsoft.com/codeofconduct/faq/
 [coc_contact]: mailto:opencode@microsoft.com
 [azure_subscription]: https://azure.microsoft.com/free/
-[samples]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos
+[samples]: https://github.com/Azure/azure-sdk-for-java/tree/feature/spring-cloud-azure-6.x/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos


Shouldn't we stick with the Main branch here? My assumption was the feature branch is used for future versions - while Main contains the current stable version?
https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/azure-spring-data-cosmos/

FabianMeiswinkel · 2022-09-21T09:39:23Z

sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md

@@ -122,7 +122,7 @@ or contact [opencode@microsoft.com][coc_contact] with any additional questions o
 [coc_faq]: https://opensource.microsoft.com/codeofconduct/faq/
 [coc_contact]: mailto:opencode@microsoft.com
 [azure_subscription]: https://azure.microsoft.com/free/
-[samples]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/cosmos/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos
+[samples]: https://github.com/Azure/azure-sdk-for-java/tree/feature/spring-cloud-azure-6.x/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos


See above - stick with Main branch

FabianMeiswinkel · 2022-09-21T09:41:19Z

eng/versioning/version_client.txt

@@ -143,8 +143,7 @@ com.azure:azure-security-keyvault-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-sdk-template;1.1.1234;1.2.2-beta.1
 com.azure:azure-sdk-template-two;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-sdk-template-three;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-spring-data-cosmos;3.26.0;3.27.0-beta.1
-com.azure:azure-spring-data-cosmos-test;3.0.0-beta.1;3.0.0-beta.1
+com.azure:azure-spring-data-cosmos;6.0.0-beta.1;6.0.0-beta.1


Why make this look like a breaking change (with major verson bump)?

FabianMeiswinkel · 2022-09-21T09:51:06Z

sdk/spring/azure-spring-data-cosmos-test/pom.xml

 <packaging>jar</packaging>
 <name>Spring Data Test for Azure Cosmos DB SQL API</name>
 <description>Spring Data Test for Azure Cosmos DB SQL API</description>
- <url>https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/cosmos/azure-spring-data-cosmos-test</url>
+ <url>https://github.com/Azure/azure-sdk-for-java/tree/feature/spring-cloud-azure-6.x/sdk/spring/azure-spring-data-cosmos-test</url>


See above - should stick with main

FabianMeiswinkel · 2022-09-21T09:56:23Z

.../test/java/com/azure/spring/data/cosmos/repository/repository/PageableAddressRepository.java

 import org.springframework.stereotype.Repository;

 @Repository
-public interface PageableAddressRepository extends PagingAndSortingRepository<Address, String> {
+public interface PageableAddressRepository extends CrudRepository<Address, String>, PagingAndSortingRepository<Address, String> {


Please revert = PagingAndSortingRepository already extends CrudRepository - so this change isn't necessary

FabianMeiswinkel · 2022-09-21T09:56:38Z

...src/test/java/com/azure/spring/data/cosmos/repository/repository/PageableMemoRepository.java

 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;

 @Repository
-public interface PageableMemoRepository extends PagingAndSortingRepository<PageableMemo, String> {
+public interface PageableMemoRepository extends CrudRepository<PageableMemo, String>, PagingAndSortingRepository<PageableMemo, String> {


See above -please revert

FabianMeiswinkel · 2022-09-21T09:56:58Z

...c/test/java/com/azure/spring/data/cosmos/repository/repository/PageablePersonRepository.java

 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;

 @Repository
-public interface PageablePersonRepository extends PagingAndSortingRepository<PageablePerson, String> {
+public interface PageablePersonRepository extends CrudRepository<PageablePerson, String>, PagingAndSortingRepository<PageablePerson, String> {


see above - pelase revert

FabianMeiswinkel · 2022-09-21T09:57:55Z

sdk/spring/azure-spring-data-cosmos/README.md

@@ -618,7 +618,7 @@ azure.cosmos.secondary.database=your-secondary-cosmosDb-dbName
 azure.cosmos.secondary.populateQueryMetrics=if-populate-query-metrics
 ```

- The [Entity](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/cosmos/azure-spring-data-cosmos#define-an-entity) and [Repository](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/cosmos/azure-spring-data-cosmos#create-repositories) definition is similar as above. You can put different database entities into different packages.
+- The [Entity](https://github.com/Azure/azure-sdk-for-java/tree/feature/spring-cloud-azure-6.x/sdk/spring/azure-spring-data-cosmos#define-an-entity) and [Repository](https://github.com/Azure/azure-sdk-for-java/tree/feature/spring-cloud-azure-6.x/sdk/spring/azure-spring-data-cosmos#create-repositories) definition is similar as above. You can put different database entities into different packages.


please stick to main

FabianMeiswinkel · 2022-09-21T09:59:41Z

sdk/spring/azure-spring-data-cosmos/pom.xml

 </parent>

 <groupId>com.azure</groupId>
 <artifactId>azure-spring-data-cosmos</artifactId>
- <version>3.27.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+ <version>6.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->


Not clear why this would be marked as breaking change (major version upgrade)? We probably need to discuss in a meeting - anytime we introduce a new major version we need to have a plan to deprecate/retire the previous one - and understand that we duplicate support cost.

FabianMeiswinkel · 2022-09-21T10:01:30Z

...ring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/CosmosRepository.java

@@ -15,7 +16,7 @@
 * pagination and sorting abstraction.
 */
 @NoRepositoryBean
-public interface CosmosRepository<T, ID extends Serializable> extends PagingAndSortingRepository<T, ID> {
+public interface CosmosRepository<T, ID extends Serializable> extends CrudRepository<T, ID>, PagingAndSortingRepository<T, ID> {


Please revert - not necessary PagingAndSortedRepository already extends CrudRepository - so CosmosRepository is implicitly extending CrudRepository already

FabianMeiswinkel · 2022-09-21T10:01:45Z

...a-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/ReactiveCosmosRepository.java

 import org.springframework.data.repository.reactive.ReactiveSortingRepository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 /**
 * Repository interface with search and delete operation
 */
 @NoRepositoryBean
-public interface ReactiveCosmosRepository<T, K> extends ReactiveSortingRepository<T, K> {
+public interface ReactiveCosmosRepository<T, K> extends ReactiveCrudRepository<T, K>, ReactiveSortingRepository<T, K> {


FabianMeiswinkel · 2022-09-21T10:04:49Z

sdk/spring/integration-matrix.json

@@ -6,7 +6,7 @@
 "ProfileFlag": "-P integration-test-azure",
 "Pool": "azsdk-pool-mms-ubuntu-2004-general",
 "OSVmImage": "MMSUbuntu2004",
- "JavaTestVersion": "1.11"
+ "JavaTestVersion": "1.17"


I guess adding Java 17 test coverage is goodness - but removing Java 11 test coverage is bad. Vast majority of our customers still uses Java 8 or 11

+1 to Fabian. Also, Java 17 doesn't work with spring-data-cosmos because of UUID support as Id type. There is an open bug #28926

FabianMeiswinkel

Few comments - also would like to understand the game plan on how to execute the move from sdk/cosmos to sdk/spring in main branch. My preference would have been to do the move in main first - to minimize the time where possibly new dev work / feature work is done in the feature branch and code diverges between master and feature branch more and more.

moarychan · 2022-10-09T06:30:52Z

Close this one, new PR is comming.

moarychan added 2 commits September 8, 2022 15:16

Migrate azure-spring-data-cosmos modules to sdk/spring dir

dd9fd44

Update the configuration for new artifacts under spring dir

27cc282

ghost added Cosmos azure-spring All azure-spring related issues labels Sep 8, 2022

moarychan added azure-spring-cosmos Spring cosmos related issues. and removed Cosmos labels Sep 8, 2022

moarychan self-assigned this Sep 8, 2022

moarychan added this to the 2022-10 milestone Sep 8, 2022

moarychan added 4 commits September 9, 2022 09:01

Fix broken links and update spring-data-cosmos project path

196f06c

Revert the spring-data-cosmos exclusions in py script

f475c63

Remove test project in dev profile

0bfd38a

Remove profiles in azure-spring-data-cosmos-test

fa2fee0

moarychan added 15 commits September 9, 2022 17:15

Update test config for spring-data-cosmos-test

38eb245

Update test config for spring-data-cosmos-test

4725fee

Update test config for spring-data-cosmos-test

f70f654

Use snapshot version for micrometer modular issue

d381498

Update enforcer plugin configuration

e633ea1

Add back the repository config and update version tag

a2f30a0

Fix failures when building from source code

36339ac

Update cosmos version and tag for spring side

d02ce47

Fix azure-cosmos version tag

28cddd2

Fix errors

f2c6db4

Fix errors

061966d

Fix errors

70a4a0f

Upgrade the micrometer to 1.10.0-M6.

5ba9a2a

Update cosmos version and override the micrometer

b9f63ce

Fix errors

e681b8a

moarychan requested review from aayush3011, kirankumarkolli, milismsft, jsquire and ronniegeraghty as code owners September 20, 2022 10:00

jsquire reviewed Sep 20, 2022

View reviewed changes

kushagraThapar requested changes Sep 20, 2022

View reviewed changes

FabianMeiswinkel reviewed Sep 21, 2022

View reviewed changes

FabianMeiswinkel requested changes Sep 21, 2022

View reviewed changes

moarychan marked this pull request as draft September 22, 2022 02:53

Remove excludes config in maven-failsafe-plugin

06df544

moarychan modified the milestones: 2022-10, 2022-11 Oct 9, 2022

moarychan closed this Oct 9, 2022

moarychan modified the milestones: 2022-11, 2022-10 Oct 14, 2022

moarychan deleted the moary/migrate-spring-data-cosmos-to-spring-dir branch July 26, 2023 15:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate spring data cosmos modules to sdk/spring dir #30854

Migrate spring data cosmos modules to sdk/spring dir #30854

moarychan commented Sep 8, 2022 •

edited

Loading

azure-sdk commented Sep 8, 2022 •

edited

Loading

moarychan commented Sep 9, 2022

azure-pipelines bot commented Sep 9, 2022

moarychan commented Sep 20, 2022

jsquire left a comment

kushagraThapar left a comment •

edited

Loading

kushagraThapar Sep 20, 2022

moarychan Sep 21, 2022

kushagraThapar Sep 20, 2022

FabianMeiswinkel Sep 21, 2022

kushagraThapar Sep 20, 2022

kushagraThapar Sep 20, 2022

moarychan Sep 21, 2022

FabianMeiswinkel Sep 21, 2022

FabianMeiswinkel Sep 21, 2022

FabianMeiswinkel Sep 21, 2022

FabianMeiswinkel Sep 21, 2022

FabianMeiswinkel Sep 21, 2022

FabianMeiswinkel Sep 21, 2022

FabianMeiswinkel Sep 21, 2022

FabianMeiswinkel Sep 21, 2022

FabianMeiswinkel Sep 21, 2022

FabianMeiswinkel Sep 21, 2022

FabianMeiswinkel Sep 21, 2022

FabianMeiswinkel Sep 21, 2022

FabianMeiswinkel Sep 21, 2022

kushagraThapar Sep 21, 2022

FabianMeiswinkel left a comment

moarychan commented Oct 9, 2022

Migrate spring data cosmos modules to sdk/spring dir #30854

Migrate spring data cosmos modules to sdk/spring dir #30854

Conversation

moarychan commented Sep 8, 2022 • edited Loading

Description

All SDK Contribution checklist:

azure-sdk commented Sep 8, 2022 • edited Loading

moarychan commented Sep 9, 2022

azure-pipelines bot commented Sep 9, 2022

moarychan commented Sep 20, 2022

jsquire left a comment

Choose a reason for hiding this comment

kushagraThapar left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

FabianMeiswinkel left a comment

Choose a reason for hiding this comment

moarychan commented Oct 9, 2022

moarychan commented Sep 8, 2022 •

edited

Loading

azure-sdk commented Sep 8, 2022 •

edited

Loading

kushagraThapar left a comment •

edited

Loading