-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Migrating spring data cosmos from sdk/cosmos to sdk/spring #33905
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
trande4884
merged 26 commits into
Azure:main
from
trande4884:trande_CosmosSpringMigration
May 9, 2023
Merged
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
33b65ed
Moving the azure-spring-data-cosmos and azure-spring-data-cosmos-test…
trande4884 f38339e
Updating the azure-spring-data-cosmos-test pom file.
trande4884 9030b83
Updating the azure-spring-data-cosmos pom file.
trande4884 2c32fcd
Updating the changelog.
trande4884 6714437
Making changes for PR.
trande4884 441926f
Making changes for PR.
trande4884 dc43651
Resolving merge conflict
trande4884 2941503
Update cspell to ignore these directories still.
trande4884 c4389f6
Resolving merge conflict
trande4884 b21c89f
Fixing paths to sdk/spring from sdk/cosmos.
trande4884 8f48e70
Fixing more paths.
trande4884 9d3dc90
Fixing more paths.
trande4884 6abec03
Switching azure-spring-data-cosmos to use the dependency versoin of a…
trande4884 1fc85f2
Merge branch 'main' of github.com:Azure/azure-sdk-for-java into trand…
trande4884 7c5bef9
Fixing dependency.
trande4884 f9b25b6
Moving azure-spring-data-cosmos to the sdk/spring ci.
trande4884 8d0cfba
Updating CI pipelines to run correctly for the migration. 'java - cos…
trande4884 e4cab54
Resolving merge conflict
trande4884 92b3988
Fixing tests.
trande4884 3d212a1
Removing un-used dependency.
trande4884 6a70251
Resolving merge conflict
trande4884 0a382c4
Resolving issue from merge conflict.
trande4884 1f67ff1
Fixing spring integration tests
trande4884 b2a4450
Fixing spring integration tests.
trande4884 5d1eb57
Resolving merge conflict.
trande4884 a4049ef
Removing duplicate from POM.
trande4884 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 0 additions & 31 deletions
31
...-test/src/test/java/com/azure/spring/data/cosmos/repository/TestRepositorySpELConfig.java
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| # NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file. | ||
| trigger: | ||
| branches: | ||
| include: | ||
| - main | ||
| - hotfix/* | ||
| - release/* | ||
| paths: | ||
| include: | ||
| - sdk/cosmos/ci.spring.yml | ||
| - sdk/cosmos/azure-cosmos/ | ||
| - sdk/cosmos/azure-cosmos-benchmark/ | ||
| - sdk/cosmos/azure-cosmos-dotnet-benchmark/ | ||
| - sdk/cosmos/azure-cosmos-encryption/ | ||
| - sdk/cosmos/azure-cosmos-examples/ | ||
| - sdk/cosmos/azure-cosmos-spark_3_2-12/ | ||
| - sdk/cosmos/azure-cosmos-spark_3-1_2-12/ | ||
| - sdk/cosmos/azure-cosmos-spark_3-2_2-12/ | ||
| - sdk/cosmos/azure-cosmos-spark_3-3_2-12/ | ||
| - sdk/cosmos/azure-cosmos-test/ | ||
| - sdk/cosmos/azure-cosmos-tests/ | ||
| - sdk/cosmos/faq/ | ||
| exclude: | ||
| - sdk/cosmos/pom.xml | ||
| - sdk/cosmos/azure-cosmos/pom.xml | ||
| - sdk/cosmos/azure-cosmos-tests/pom.xml | ||
| - sdk/cosmos/azure-cosmos-benchmark/pom.xml | ||
| - sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml | ||
| - sdk/cosmos/azure-cosmos-encryption/pom.xml | ||
| - sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml | ||
| - sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml | ||
| - sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml | ||
| - sdk/cosmos/azure-cosmos-spark_3-3_2-12/pom.xml - | ||
|
|
||
| pr: | ||
| branches: | ||
| include: | ||
| - main | ||
| - feature/* | ||
| - hotfix/* | ||
| - release/* | ||
| paths: | ||
| include: | ||
| - sdk/cosmos/ci.spring.yml | ||
| - sdk/cosmos/azure-cosmos/ | ||
| - sdk/cosmos/azure-cosmos-benchmark/ | ||
| - sdk/cosmos/azure-cosmos-dotnet-benchmark/ | ||
| - sdk/cosmos/azure-cosmos-encryption/ | ||
| - sdk/cosmos/azure-cosmos-examples/ | ||
| - sdk/cosmos/azure-cosmos-test/ | ||
| - sdk/cosmos/azure-cosmos-tests/ | ||
| - sdk/cosmos/azure-cosmos-spark_3_2-12/ | ||
| - sdk/cosmos/azure-cosmos-spark_3-1_2-12/ | ||
| - sdk/cosmos/azure-cosmos-spark_3-2_2-12/ | ||
| - sdk/cosmos/azure-cosmos-spark_3-3_2-12/ - | ||
| - sdk/cosmos/faq/ | ||
| exclude: | ||
| - sdk/cosmos/pom.xml | ||
| - sdk/cosmos/azure-cosmos/pom.xml | ||
| - sdk/cosmos/azure-cosmos-benchmark/pom.xml | ||
| - sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml | ||
| - sdk/cosmos/azure-cosmos-encryption/pom.xml | ||
| - sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml | ||
| - sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml | ||
| - sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml | ||
| - sdk/cosmos/azure-cosmos-spark_3-3_2-12/pom.xml - | ||
| - sdk/cosmos/azure-cosmos-test/pom.xml | ||
| - sdk/cosmos/azure-cosmos-tests/pom.xml | ||
|
|
||
| extends: | ||
| template: /eng/pipelines/templates/stages/archetype-sdk-client.yml | ||
| parameters: | ||
| ServiceDirectory: spring | ||
| Artifacts: | ||
| - name: azure-spring-data-cosmos | ||
| groupId: com.azure | ||
| safeName: azurespringdatacosmos | ||
| releaseInBatch: false | ||
| AdditionalModules: | ||
| - name: azure-spring-data-cosmos-test | ||
| groupId: com.azure |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
18 changes: 18 additions & 0 deletions
18
...-test/src/test/java/com/azure/spring/data/cosmos/repository/TestRepositorySpELConfig.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. | ||
| package com.azure.spring.data.cosmos.repository; | ||
|
|
||
| import com.azure.spring.data.cosmos.common.DynamicContainer; | ||
| import com.azure.spring.data.cosmos.common.TestConstants; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| @Configuration | ||
| public class TestRepositorySpELConfig extends TestRepositoryConfig { | ||
|
|
||
| @Bean | ||
| public DynamicContainer dynamicContainer() { | ||
| return new DynamicContainer(TestConstants.DYNAMIC_BEAN_COLLECTION_NAME); | ||
| } | ||
|
|
||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.