Feature/migrate-spring-data-cosmos #12287

yiliuTo · 2020-06-17T10:20:40Z

Migrate source code and unit tests from repo spring-data-cosmos here.

Change the dependency in azure-spring-boot of spring-data-cosmos from external to current.

Keep several dependency versions different from SDK including

spring_org.springframework:spring-web
spring_com.microsoft.azure:azure-cosmos
spring_org.springframework.boot:spring-boot-starter-test

alzimmermsft · 2020-06-17T16:12:33Z

sdk/spring/azure-spring-boot/pom.xml

+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-identity</artifactId>
+      <version>1.0.4</version>


Shouldn't this be using the latest GA version available which is 1.0.7?

Yes, this snippet failed to be modified by rebasing and I will delete it manually.

kushagraThapar · 2020-06-17T18:05:22Z

sdk/spring/azure-spring-data-cosmosdb/QueryPartitionedCollection.md

+Write the repository interface:
+```
+    @Repository
+    public interface AddressRepository extends DocumentDbRepository<Address, String> {


There is no DocumentDbRepository. That is in old spring-data-cosmosdb SDK.
This should extend CosmosRepository or ReactiveCosmosRepository

kushagraThapar · 2020-06-17T18:06:13Z

sdk/spring/azure-spring-data-cosmosdb/QueryPartitionedCollection.md

@@ -0,0 +1,58 @@
+### How to Query Partitioned Azure Cosmos DB Collection


What is the use of this file ?
This should be merged with README file, or move this topic to spring-data-cosmosdb developer's guide : https://docs.microsoft.com/en-us/azure/developer/java/spring-framework/how-to-guides-spring-data-cosmosdb

The content of this file has been included into README file about using partitioned query, thus I will remove this file.

JimSuplizio

Right now I'm only making a few comments about the external dependencies. Before I review anything else I expect the Analyze, specifically the pom file version scanner step, and the From Source runs to be passing. There a are a number of errors that the version scanner picked up that are listed in the output that need to be fixed.

JimSuplizio · 2020-06-17T16:03:02Z

eng/versioning/external_dependencies.txt

+#sdk\spring\spring-data-cosmosdb\pom.xml
+spring_org.springframework:spring-web;5.2.6.RELEASE
+spring_com.microsoft.azure:azure-cosmos;3.7.3
+spring_org.springframework.boot:spring-boot-starter-test;2.3.0.RELEASE


First, spring_ only dependencies should be infrequent or in rare cases. The org.springframework versions here have been updated as part of another PR which has been approved. I recommended rebasing after that gets submitted. Second, the com.microsoft.azure:azure-cosmos dependency was added as part of this Spring PR several weeks back and apparently nothing previously used it. So the spring_com.microsoft.azure:azure-cosmos is unnecessary and the existing dependency version should be updated. In the future, I'm like to recommend either grep/findstr/search within whatever IDE is being used. If a dependency is an existing one, then updating that is the preferred method over declaring spring specific dependencies which may require contacting another library owner and those can be found in the CODEOWNERS file

Thanks for the suggestions. I have rebased the related PR and updated version of the dependencies.

yiliuTo · 2020-06-18T13:53:52Z

Hi @JimSuplizio, due to the -amd parameter in java-core-ci pipeline, the azure-spring-boot project gets triggered while spring-data-cosmosdb not, however azure-spring-boot depends on spring-data-cosmosdb thus the java-core-ci pipeline always fails.
To deal with this problem, currently I add a useless dependency azure-identity in spring-data-cosmos and now the pipeline can pass now. It seems such solution doesn't solve the problem completely and imports a useless dependency. Could you please help us with some suggestions? Thank you~

yiliuTo · 2020-06-22T12:11:42Z

In order to pass the java-core-ci pipeline, currently I add the spring-data-cosmosdb as the external dependency for azure-spring-boot project given that it cannot be built as a dependency of track 2.

saragluna · 2020-06-22T12:59:52Z

Hi @JimSuplizio and @kushagraThapar, could you please take a look at this PR?

JimSuplizio · 2020-06-22T16:19:19Z

In order to pass the java-core-ci pipeline, currently I add the spring-data-cosmosdb as the external dependency for azure-spring-boot project given that it cannot be built as a dependency of track 2.

This is exactly what I'd said [needed to get done] (Azure/azure-sdk#892 (comment)). Until the spring-data-cosmosdb, being added to the repository, is updated to target v4 cosmos, spring is going to have to use the released versions as external dependencies.

JimSuplizio

I'm approving this as per a discussion between @kushagraThapar and myself. He's going to create work item to make spring-data-comos use v4 cosmos, update the groupId, artifactId and version to reflect these changes. I would still like his approval before this is merged.

JimSuplizio · 2020-06-23T01:07:33Z

eng/versioning/version_client.txt

@@ -55,7 +55,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


@kushagraThapar, as per our discussion earlier we'll let this get checked in like this but part of the v4 updates will be to rename the groupId and change the artifactId to match the naming convention. Also, the work item you're creating will also encompass updating the versions to match this update to v4 cosmos which will update the major to 3.

@JimSuplizio - Sounds good. Here is the issue : #12490

yiliuTo requested review from danieljurek, jialindai, JimSuplizio, JonathanGiles, mitchdenny, mssfang, saragluna and weshaggard as code owners June 17, 2020 10:20

alzimmermsft reviewed Jun 17, 2020

View reviewed changes

kushagraThapar requested changes Jun 17, 2020

View reviewed changes

JimSuplizio requested changes Jun 17, 2020

View reviewed changes

yiliuTo force-pushed the feature/migrate-spring-data-cosmos branch from d5bd3ac to 1a0201e Compare June 18, 2020 02:25

yiliuTo requested a review from srnagar as a code owner June 18, 2020 02:25

mitchdenny mentioned this pull request Jun 18, 2020

Repository structure revision: sdk/[x] instead of sdk/[service] Azure/azure-sdk#892

Closed

yiliuTo added 14 commits June 22, 2020 13:47

apply pr: Deliver multiple KeyVault support

fb467c4

migrate src files from spring-data-cosmosdb

3cd2c7d

modify pom and dependency versions

91dd74c

add tests

976d697

modify for compiler errors

1d6b098

modify for checkstyle errors

d4fd2df

update underlying library versions

d1e7aaf

add changelog

4d404db

modify for dependency version

89776ce

modify readme title and add dependency for java11

f2543cb

add code owner

97f6ca2

add debug for pipeline error temporarily

53fa59e

add dependency in cosmos for running java-core-ci

699ba12

move spring-data-cosmosdb to sdk/cosmos

ce265b7

yiliuTo force-pushed the feature/migrate-spring-data-cosmos branch from 0e022d7 to ce265b7 Compare June 22, 2020 05:53

yiliuTo requested review from David-Noble-at-work, kirankumarkolli, mbhaskar and moderakh as code owners June 22, 2020 05:53

yiliuTo added 2 commits June 22, 2020 14:17

fix for the pipeline

abfa961

add spring-data-cosmosdb as external-dependency for pipeline

e2b8ba1

yiliuTo force-pushed the feature/migrate-spring-data-cosmos branch from c659f98 to e2b8ba1 Compare June 22, 2020 08:18

modify codeowner

826c8ea

JimSuplizio approved these changes Jun 23, 2020

View reviewed changes

kushagraThapar approved these changes Jun 24, 2020

View reviewed changes

saragluna merged commit 35d9154 into Azure:master Jun 25, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/migrate-spring-data-cosmos #12287

Feature/migrate-spring-data-cosmos #12287

yiliuTo commented Jun 17, 2020

alzimmermsft Jun 17, 2020

yiliuTo Jun 18, 2020 •

edited

Loading

kushagraThapar Jun 17, 2020

kushagraThapar Jun 17, 2020

yiliuTo Jun 18, 2020

JimSuplizio left a comment

JimSuplizio Jun 17, 2020

yiliuTo Jun 18, 2020

yiliuTo commented Jun 18, 2020

yiliuTo commented Jun 22, 2020 •

edited

Loading

saragluna commented Jun 22, 2020

JimSuplizio commented Jun 22, 2020

JimSuplizio left a comment

JimSuplizio Jun 23, 2020

kushagraThapar Jun 24, 2020

		@@ -0,0 +1,58 @@
		### How to Query Partitioned Azure Cosmos DB Collection

Feature/migrate-spring-data-cosmos #12287

Feature/migrate-spring-data-cosmos #12287

Conversation

yiliuTo commented Jun 17, 2020

Choose a reason for hiding this comment

yiliuTo Jun 18, 2020 • 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

JimSuplizio left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yiliuTo commented Jun 18, 2020

yiliuTo commented Jun 22, 2020 • edited Loading

saragluna commented Jun 22, 2020

JimSuplizio commented Jun 22, 2020

JimSuplizio left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yiliuTo Jun 18, 2020 •

edited

Loading

yiliuTo commented Jun 22, 2020 •

edited

Loading