From 8f543e07a23f2f821ccd27dc504d8faf2eff4130 Mon Sep 17 00:00:00 2001
From: seonghyeoklee <dltjdgur327@gmail.com>
Date: Mon, 2 Mar 2026 16:56:53 +0900
Subject: [PATCH] Widen operator method parameters from Criteria to
 CriteriaDefinition

Update orOperator, norOperator, andOperator and their Collection
overloads to accept CriteriaDefinition instead of Criteria. This
allows mixing different CriteriaDefinition implementations such as
Criteria and TextCriteria in logical operators.

Closes gh-3895

Signed-off-by: seonghyeoklee <rfrg312@naver.com>
Signed-off-by: seonghyeoklee <dltjdgur327@gmail.com>
---
 .../data/mongodb/core/query/Criteria.java        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java
index e74f18fe3b..4f9eff4ca8 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java
@@ -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");
 
@@ -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");
 
@@ -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");
 
@@ -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");
 
@@ -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");
 
@@ -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");
 
@@ -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;