From 04ebec993d67b71a0d09a7e62a180a5485cf8575 Mon Sep 17 00:00:00 2001 From: Thomas Risberg Date: Thu, 20 Oct 2011 15:34:51 -0400 Subject: [PATCH] DATADOC-300 Removing old 'or' metod, adding JavaDoc --- .../data/mongodb/core/query/Criteria.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 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 43b302666..78759f65f 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 @@ -357,26 +357,32 @@ public class Criteria implements CriteriaDefinition { } /** - * Creates an or query using the $or operator for all of the provided queries + * Creates an 'or' criteria using the $or operator for all of the provided criteria * - * @param queries + * @param criteria */ - public void or(List queries) { - criteria.put("$or", queries); - } - public Criteria orOperator(Criteria... criteria) { BasicBSONList bsonList = createCriteriaList(criteria); criteriaChain.add(new Criteria("$or").is(bsonList)); return this; } + /** + * Creates a 'nor' criteria using the $nor operator for all of the provided criteria + * + * @param criteria + */ public Criteria norOperator(Criteria... criteria) { BasicBSONList bsonList = createCriteriaList(criteria); criteriaChain.add(new Criteria("$nor").is(bsonList)); return this; } + /** + * Creates an 'and' criteria using the $and operator for all of the provided criteria + * + * @param criteria + */ public Criteria andOperator(Criteria... criteria) { BasicBSONList bsonList = createCriteriaList(criteria); criteriaChain.add(new Criteria("$and").is(bsonList));