From fdecec48b2f32181ed3e268a254e8e7ca5d2df57 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 12 Sep 2012 11:54:20 +0200 Subject: [PATCH] DATAMONGO-484 - Upgraded to MongoDB driver 2.9.1. --- spring-data-mongodb-log4j/pom.xml | 4 ---- spring-data-mongodb-parent/pom.xml | 1 + spring-data-mongodb/pom.xml | 1 - .../data/mongodb/core/mapreduce/GroupByTests.java | 10 ++++------ .../data/mongodb/core/query/QueryTests.java | 8 ++++---- .../src/test/resources/log4j.properties | 2 +- 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/spring-data-mongodb-log4j/pom.xml b/spring-data-mongodb-log4j/pom.xml index 52a36bc15..a87c6133b 100644 --- a/spring-data-mongodb-log4j/pom.xml +++ b/spring-data-mongodb-log4j/pom.xml @@ -10,10 +10,6 @@ spring-data-mongodb-log4j Spring Data MongoDB Log4J Appender - - 2.3 - - diff --git a/spring-data-mongodb-parent/pom.xml b/spring-data-mongodb-parent/pom.xml index 53d3eb1a4..b35119724 100644 --- a/spring-data-mongodb-parent/pom.xml +++ b/spring-data-mongodb-parent/pom.xml @@ -10,6 +10,7 @@ UTF-8 + 2.9.1 4.10 1.2.16 1.9.0 diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml index 68e046159..fbc7c1575 100644 --- a/spring-data-mongodb/pom.xml +++ b/spring-data-mongodb/pom.xml @@ -11,7 +11,6 @@ Spring Data MongoDB - 2.7.1 2.6.0 1.0 1.0.0.GA diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/GroupByTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/GroupByTests.java index aadd62420..1184004ca 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/GroupByTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/GroupByTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2011 the original author or authors. + * Copyright 2011-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,11 +44,9 @@ import com.mongodb.Mongo; @ContextConfiguration("classpath:infrastructure.xml") public class GroupByTests { - @Autowired - MongoDbFactory factory; + @Autowired MongoDbFactory factory; - @Autowired - ApplicationContext applicationContext; + @Autowired ApplicationContext applicationContext; MongoTemplate mongoTemplate; @@ -158,7 +156,7 @@ public class GroupByTests { private void assertMapReduceResults(GroupByResults results) { DBObject dboRawResults = results.getRawResults(); - String expected = "{ \"serverUsed\" : \"127.0.0.1:27017\" , \"retval\" : [ { \"x\" : 1.0 , \"count\" : 2.0} , { \"x\" : 2.0 , \"count\" : 1.0} , { \"x\" : 3.0 , \"count\" : 3.0}] , \"count\" : 6.0 , \"keys\" : 3 , \"ok\" : 1.0}"; + String expected = "{ \"serverUsed\" : \"/127.0.0.1:27017\" , \"retval\" : [ { \"x\" : 1.0 , \"count\" : 2.0} , { \"x\" : 2.0 , \"count\" : 1.0} , { \"x\" : 3.0 , \"count\" : 3.0}] , \"count\" : 6.0 , \"keys\" : 3 , \"ok\" : 1.0}"; Assert.assertEquals(expected, dboRawResults.toString()); int numResults = 0; diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/QueryTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/QueryTests.java index 5c9660a57..c60d9010f 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/QueryTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/QueryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2011 the original author or authors. + * Copyright 2010-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -100,7 +100,7 @@ public class QueryTests { public void testComplexQueryWithMultipleChainedCriteria() { Query q = new Query(where("name").regex("^T.*").and("age").gt(20).lt(80).and("city") .in("Stockholm", "London", "New York")); - String expected = "{ \"name\" : { \"$regex\" : \"^T.*\" , \"$options\" : \"\"} , \"age\" : { \"$gt\" : 20 , \"$lt\" : 80} , " + String expected = "{ \"name\" : { \"$regex\" : \"^T.*\"} , \"age\" : { \"$gt\" : 20 , \"$lt\" : 80} , " + "\"city\" : { \"$in\" : [ \"Stockholm\" , \"London\" , \"New York\"]}}"; Assert.assertEquals(expected, q.getQueryObject().toString()); } @@ -134,12 +134,12 @@ public class QueryTests { @Test public void testQueryWithRegex() { Query q = new Query(where("name").regex("b.*")); - String expected = "{ \"name\" : { \"$regex\" : \"b.*\" , \"$options\" : \"\"}}"; + String expected = "{ \"name\" : { \"$regex\" : \"b.*\"}}"; Assert.assertEquals(expected, q.getQueryObject().toString()); } @Test - public void testQueryWithRegexandOption() { + public void testQueryWithRegexAndOption() { Query q = new Query(where("name").regex("b.*", "i")); String expected = "{ \"name\" : { \"$regex\" : \"b.*\" , \"$options\" : \"i\"}}"; Assert.assertEquals(expected, q.getQueryObject().toString()); diff --git a/spring-data-mongodb/src/test/resources/log4j.properties b/spring-data-mongodb/src/test/resources/log4j.properties index 238853196..37f4dbd7a 100644 --- a/spring-data-mongodb/src/test/resources/log4j.properties +++ b/spring-data-mongodb/src/test/resources/log4j.properties @@ -1,4 +1,4 @@ -log4j.rootCategory=WARN, stdout +log4j.rootCategory=ERROR, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout