Skip to content

Widen operator method parameters from Criteria to CriteriaDefinition #5171

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

Open
seonghyeoklee wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −8
Open

Widen operator method parameters from Criteria to CriteriaDefinition #5171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ public BitwiseCriteriaOperators bits() {
* @return this.
*/
@Contract("_ -> this")
public Criteria orOperator(Criteria... criteria) {
public Criteria orOperator(CriteriaDefinition... criteria) {

Assert.notNull(criteria, "Criteria must not be null");

Expand All @@ -860,7 +860,7 @@ public Criteria orOperator(Criteria... criteria) {
* @since 3.2
*/
@Contract("_ -> this")
public Criteria orOperator(Collection<Criteria> criteria) {
public Criteria orOperator(Collection<? extends CriteriaDefinition> criteria) {

Assert.notNull(criteria, "Criteria must not be null");

Expand All @@ -878,7 +878,7 @@ public Criteria orOperator(Collection<Criteria> criteria) {
* @return this.
*/
@Contract("_ -> this")
public Criteria norOperator(Criteria... criteria) {
public Criteria norOperator(CriteriaDefinition... criteria) {

Assert.notNull(criteria, "Criteria must not be null");

Expand All @@ -896,7 +896,7 @@ public Criteria norOperator(Criteria... criteria) {
* @since 3.2
*/
@Contract("_ -> this")
public Criteria norOperator(Collection<Criteria> criteria) {
public Criteria norOperator(Collection<? extends CriteriaDefinition> criteria) {

Assert.notNull(criteria, "Criteria must not be null");

Expand All @@ -914,7 +914,7 @@ public Criteria norOperator(Collection<Criteria> criteria) {
* @return this.
*/
@Contract("_ -> this")
public Criteria andOperator(Criteria... criteria) {
public Criteria andOperator(CriteriaDefinition... criteria) {

Assert.notNull(criteria, "Criteria must not be null");

Expand All @@ -932,7 +932,7 @@ public Criteria andOperator(Criteria... criteria) {
* @since 3.2
*/
@Contract("_ -> this")
public Criteria andOperator(Collection<Criteria> criteria) {
public Criteria andOperator(Collection<? extends CriteriaDefinition> criteria) {

Assert.notNull(criteria, "Criteria must not be null");

Expand Down Expand Up @@ -1048,9 +1048,9 @@ protected Document getSingleCriteriaObject() {
return queryCriteria;
}

private BasicDBList createCriteriaList(Collection<Criteria> criteria) {
private BasicDBList createCriteriaList(Collection<? extends CriteriaDefinition> criteria) {
BasicDBList bsonList = new BasicDBList();
for (Criteria c : criteria) {
for (CriteriaDefinition c : criteria) {
bsonList.add(c.getCriteriaObject());
}
return bsonList;
Expand Down