From 3893eb126d7da5fef5b0ad08e5e7658a201ae9b8 Mon Sep 17 00:00:00 2001 From: Mark Pollack Date: Tue, 24 May 2011 00:55:30 -0400 Subject: [PATCH] DATADOC-83 - Review dependencies --- spring-data-mongodb/pom.xml | 4 ---- .../data/document/mongodb/MongoExceptionTranslator.java | 3 +-- .../data/document/mongodb/query/Criteria.java | 9 +++++---- .../data/document/mongodb/MongoTemplateTests.java | 3 +-- .../data/document/mongodb/query/QueryTests.java | 4 ++-- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml index 5ef5ccf0d..0d5626322 100644 --- a/spring-data-mongodb/pom.xml +++ b/spring-data-mongodb/pom.xml @@ -24,10 +24,6 @@ org.springframework spring-beans - - org.springframework - spring-tx - org.springframework spring-expression diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoExceptionTranslator.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoExceptionTranslator.java index 92611e38f..ebee63c70 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoExceptionTranslator.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoExceptionTranslator.java @@ -28,7 +28,6 @@ import org.springframework.dao.DuplicateKeyException; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.dao.InvalidDataAccessResourceUsageException; import org.springframework.dao.support.PersistenceExceptionTranslator; -import org.springframework.data.document.UncategorizedDocumentStoreException; /** * Simple {@link PersistenceExceptionTranslator} for Mongo. Convert the given runtime exception to an appropriate @@ -71,7 +70,7 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator } else if (code == 10003 || code == 12001 || code == 12010 || code == 12011 || code == 12012) { throw new InvalidDataAccessApiUsageException(ex.getMessage(), ex); } - return new UncategorizedDocumentStoreException(ex.getMessage(), ex); + return new UncategorizedMongoDbException(ex.getMessage(), ex); } if (ex instanceof MongoInternalException) { return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java index cf2f4df0c..015a98069 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java @@ -23,7 +23,8 @@ import java.util.List; import com.mongodb.BasicDBObject; import com.mongodb.DBObject; -import org.springframework.data.document.InvalidDocumentStoreApiUsageException; + +import org.springframework.data.document.mongodb.InvalidMongoDbApiUsageException; import org.springframework.data.document.mongodb.geo.Box; import org.springframework.data.document.mongodb.geo.Circle; import org.springframework.data.document.mongodb.geo.Point; @@ -84,11 +85,11 @@ public class Criteria implements CriteriaDefinition { */ public Criteria is(Object o) { if (isValue != NOT_SET) { - throw new InvalidDocumentStoreApiUsageException( + throw new InvalidMongoDbApiUsageException( "Multiple 'is' values declared. You need to use 'and' with multiple criteria"); } if (this.criteria.size() > 0 && "$not".equals(this.criteria.keySet().toArray()[this.criteria.size() - 1])) { - throw new InvalidDocumentStoreApiUsageException( + throw new InvalidMongoDbApiUsageException( "Invalid query: 'not' can't be used with 'is' - use 'ne' instead."); } this.isValue = o; @@ -159,7 +160,7 @@ public class Criteria implements CriteriaDefinition { */ public Criteria in(Object... o) { if (o.length > 1 && o[1] instanceof Collection) { - throw new InvalidDocumentStoreApiUsageException("You can only pass in one argument of type " + throw new InvalidMongoDbApiUsageException("You can only pass in one argument of type " + o[1].getClass().getName()); } criteria.put("$in", o); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java index d459a31d9..315f0f7da 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java @@ -39,7 +39,6 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.dao.DataIntegrityViolationException; -import org.springframework.data.document.InvalidDocumentStoreApiUsageException; import org.springframework.data.document.mongodb.convert.MappingMongoConverter; import org.springframework.data.document.mongodb.convert.MongoConverter; import org.springframework.data.document.mongodb.mapping.MongoMappingContext; @@ -368,7 +367,7 @@ public class MongoTemplateTests { Query q3 = new Query(Criteria.where("age").in(l1, l2)); template.find(q3, PersonWithIdPropertyOfTypeObjectId.class); Assert.fail("Should have trown an InvalidDocumentStoreApiUsageException"); - } catch (InvalidDocumentStoreApiUsageException e) { + } catch (InvalidMongoDbApiUsageException e) { } } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/query/QueryTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/query/QueryTests.java index 5c6795c0f..b252b0469 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/query/QueryTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/query/QueryTests.java @@ -19,7 +19,7 @@ import static org.springframework.data.document.mongodb.query.Criteria.where; import org.junit.Assert; import org.junit.Test; -import org.springframework.data.document.InvalidDocumentStoreApiUsageException; +import org.springframework.data.document.mongodb.InvalidMongoDbApiUsageException; public class QueryTests { @@ -42,7 +42,7 @@ public class QueryTests { try { new Query(where("name").not().is("Thomas")); Assert.fail("This should have caused an InvalidDocumentStoreApiUsageException"); - } catch (InvalidDocumentStoreApiUsageException e) { + } catch (InvalidMongoDbApiUsageException e) { } }