From 5df61563f4777354d8054de44385ce3b4f9548fe Mon Sep 17 00:00:00 2001
From: Thomas Risberg <trisberg@vmware.com>
Date: Thu, 20 Oct 2011 15:44:23 -0400
Subject: [PATCH] DATADOC-300 Changing to use InvalidMongoDbApiUsageException

---
 .../springframework/data/mongodb/core/query/Criteria.java    | 3 +--
 .../org/springframework/data/mongodb/core/query/Query.java   | 5 ++---
 2 files changed, 3 insertions(+), 5 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 78759f65f..423093fe9 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
@@ -21,7 +21,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 
 import org.bson.types.BasicBSONList;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
 import org.springframework.data.mongodb.core.geo.Circle;
 import org.springframework.data.mongodb.core.geo.Point;
@@ -456,7 +455,7 @@ public class Criteria implements CriteriaDefinition {
 			dbo.put(key, value);
 		}
 		else {
-			throw new InvalidDataAccessApiUsageException("Due to limitations of the com.mongodb.BasicDBObject, " +
+			throw new InvalidMongoDbApiUsageException("Due to limitations of the com.mongodb.BasicDBObject, " +
 					"you can't add a second '" + key + "' expression specified as '" + key + " : " + value + "'. " +
 					"Criteria already contains '" + key + " : " + existing + "'.");
 		}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
index a2c52d179..60926f918 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
@@ -16,13 +16,12 @@
 package org.springframework.data.mongodb.core.query;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
 
 public class Query {
 
@@ -56,7 +55,7 @@ public class Query {
 			this.criteria.put(key, criteria);
 		}
 		else {
-			throw new InvalidDataAccessApiUsageException("Due to limitations of the com.mongodb.BasicDBObject, " +
+			throw new InvalidMongoDbApiUsageException("Due to limitations of the com.mongodb.BasicDBObject, " +
 					"you can't add a second '" + key + "' criteria. " +
 					"Query already contains '" + existing.getCriteriaObject() + "'.");
 		}