Skip to content

DATACOUCH-1066 - N1qlExpression as QueryCriteria key. #1081

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 37 commits into from
Closed

DATACOUCH-1066 - N1qlExpression as QueryCriteria key. #1081

wants to merge 37 commits into from

Conversation

mikereiche
Copy link
Collaborator

This is a merge of mmonti's changeset into master. The changeset was made
on top of 4.1.x instead of master so it has a little catching up to do.

Merge branch 'gh-1066-n1qlexpression-as-querycriteria-key' of github.com:mmonti/spring-data-couchbase into datacouch_1066_1072_mmonti_n1ql_query_creator_expression

Original pull request #1076

  • You have read the Spring Data contribution guidelines.
  • There is a ticket in the bug tracker for the project in our JIRA.
  • You use the code formatters provided here and have them applied to your changes. Don’t submit any formatting related changes.
  • You submit test cases (unit or integration tests) that back your changes.
  • You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only).

mp911de and others added 30 commits October 28, 2020 16:10
@mp911de
DATACOUCH-635 - Prepare next development iteration.
4b2a954
@mp911de
DATACOUCH-635 - After release cleanups.
6c7e882
@mp911de
DATACOUCH-635 - Enable maintenance branch build.
17e2483
@mp911de
DATACOUCH-641 - Enable Maven caching for Jenkins jobs.
02aca19
@mp911de
DATACOUCH-639 - Updated changelog.
d50b09c
@mp911de
DATACOUCH-639 - Prepare 4.1.1 (2020.0.1).
9d671a8
@mp911de
DATACOUCH-639 - Release version 4.1.1 (2020.0.1).
18ea50b
@mp911de
DATACOUCH-639 - Prepare next development iteration.
6ed5f52
@mp911de
DATACOUCH-639 - After release cleanups.
b5d96b8
@mikereiche
DATACOUCH-662 Upgrade Couchbase Java SDK to 3.0.10 for 4.1.x. (#283)
3138b4a 
Co-authored-by: mikereiche <[email protected]>
@mp911de
DATACOUCH-637 - Updated changelog.
9d50ed9
@mp911de
DATACOUCH-638 - Updated changelog.
b73fd67
@mp911de
DATACOUCH-640 - Updated changelog.
d83036f
@mp911de
DATACOUCH-648 - Updated changelog.
3e8bda0
@mp911de
DATACOUCH-648 - Prepare 4.1.2 (2020.0.2).
d313bac
@mp911de
DATACOUCH-648 - Release version 4.1.2 (2020.0.2).
57154e2
@mp911de
DATACOUCH-648 - Prepare next development iteration.
b2a0e69
@mp911de
DATACOUCH-648 - After release cleanups.
d925df2
@mikereiche
DATACOUCH-630 - Add expiry to replace 4.1.x. (#286)
e97ef65 
Co-authored-by: mikereiche <[email protected]>
@mikereiche
DATACOUCH-666 - Handle immutable entity in replace. (#288)
f33cd3c 
Co-authored-by: mikereiche <[email protected]>
@mikereiche
DATACOUCH-672 - reinstate replace expiry tests (#289)
788f7d9 
Co-authored-by: mikereiche <[email protected]>
@schauder @mikereiche
DATACOUCH-650 - Implements CrudRepository and ReactiveCrudRepository.…
dfd2dd6 
…deleteById(Iterable<ID> ids).

Original pull request: #279.
@mp911de @mikereiche
DATACOUCH-650 - Polishing.
57c21a7 
Reorder methods. Remove superfluous final keyword. Reformat pom. Fix dependency to Spring Data Commons.

Original pull request: #279.
@mikereiche
DATACOUCH-661 - Fix integrations tests from 650. (#281)
0d110de 
Co-authored-by: mikereiche <[email protected]>
@mikereiche
DATACOUCH-666 - Set Ccouchbase java sdk back to 3.0.10 after inadvert…
aa52337 
…enly changing. (#290)
@gregturn
DATACOUCH-664 - Use Docker hub credentials for all CI jobs.
8991562
@mp911de
Revert commits for DATACOUCH-650 that shouldn't had been backported t…
06500e1 
…o 4.1.x.

See #1042
@christophstrobl
Updated changelog.
f788293 
See #979
@christophstrobl
Prepare 4.1.3 (2020.0.3).
d2a6ced 
See #979
@christophstrobl
Release version 4.1.3 (2020.0.3).
5a55a79 
See #979
christophstrobl and others added 7 commits January 13, 2021 15:01
@christophstrobl
Prepare next development iteration.
4da3b9b 
See #979
@christophstrobl
After release cleanups.
d2be5d1 
See #979
@christophstrobl
Updated changelog.
01880de 
See #978
@mmonti
This commit fixes the generated query by N1QLQueryCreator when the cr…
346020f 
…iteria includes an id or a version property, using META($bucket).

It also solves removes the need of maybeBacktics() in QueryCriteria using N1QLExpression as key

Related tickets #1072, #1066
- #1072
- #1066
@mmonti
This commit modified the addMetaIfRequired() to support META() on id …
cbb7d4d 
…and version properties.

Related tickets:
- #1072
@mmonti
This commit adds a version of the public methods where(), and() and o…
66d18f0 
…r() but receiving a String key.

Related tickets:
- #1072
@mikereiche
DATACOUCH-1066 - N1qlExpression as QueryCriteria key.
51d349b 
This is a merge of mmonti's changeset into master.  The changeset was made
on top of 4.1.x instead of master so it has a little catching up to do.

Merge branch 'gh-1066-n1qlexpression-as-querycriteria-key' of github.com:mmonti/spring-data-couchbase into datacouch_1066_1072_mmonti_n1ql_query_creator_expression

Original pull request #1076
@mikereiche mikereiche closed this Feb 17, 2021
@mmonti
Copy link

mmonti commented Feb 18, 2021

Hi @mikereiche,

I just saw the comment on this PR:

This is a merge of mmonti's changeset into master. The changeset was made
on top of 4.1.x instead of master so it has a little catching up to do.

Should I try to create the same changes on top of master? Let me know, I can give it a try...

@mikereiche
Copy link
Collaborator Author

Hi @mmonti - Thanks for your branch. I adjusted it for master and committed to master and then cherry-picked it for 4.1.x after. The 4.1.7 release should go out tomorrow with your changes (it was supposed to go out today, that's why I rushed to get your change in). The only thing that didn't work out is that it doesn't show it was your branch. Sorry.

@mmonti
Copy link

mmonti commented Feb 18, 2021

Ah! got it! Awesome!.. no worries about the branch.
I am just glad that the changes were merged.
Thank you!

@mikereiche mikereiche mentioned this pull request Feb 22, 2021
Closed
@mikereiche mikereiche deleted the datacouch_1066_1072_mmonti_n1ql_query_creator_expression branch September 14, 2021 17:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@mikereiche @mmonti @mp911de @schauder @gregturn @christophstrobl