From 4aac36875f63454cd189fae7ea8e1260594784e0 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Tue, 8 Jul 2014 17:50:37 +0200 Subject: [PATCH 1/2] DATAMONGO-982 - Get rid of deprecations to prepare 3.0 driver compatibility. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switched from ensureIndex(…) to createIndex(…). Removed the exception types to be removed in 3.0 of the driver. --- .../data/mongodb/core/DefaultIndexOperations.java | 4 ++-- .../data/mongodb/core/MongoExceptionTranslator.java | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java index c971f66129..55da8ae717 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java @@ -73,9 +73,9 @@ public void ensureIndex(final IndexDefinition indexDefinition) { public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException { DBObject indexOptions = indexDefinition.getIndexOptions(); if (indexOptions != null) { - collection.ensureIndex(indexDefinition.getIndexKeys(), indexOptions); + collection.createIndex(indexDefinition.getIndexKeys(), indexOptions); } else { - collection.ensureIndex(indexDefinition.getIndexKeys()); + collection.createIndex(indexDefinition.getIndexKeys()); } return null; } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoExceptionTranslator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoExceptionTranslator.java index b8eeb427dd..7a56b418a8 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoExceptionTranslator.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoExceptionTranslator.java @@ -25,9 +25,7 @@ import com.mongodb.MongoCursorNotFoundException; import com.mongodb.MongoException; -import com.mongodb.MongoException.CursorNotFound; import com.mongodb.MongoException.DuplicateKey; -import com.mongodb.MongoException.Network; import com.mongodb.MongoInternalException; import com.mongodb.MongoServerSelectionException; import com.mongodb.MongoSocketException; @@ -55,11 +53,11 @@ public DataAccessException translateExceptionIfPossible(RuntimeException ex) { return new DuplicateKeyException(ex.getMessage(), ex); } - if (ex instanceof Network || ex instanceof MongoSocketException) { + if (ex instanceof MongoSocketException) { return new DataAccessResourceFailureException(ex.getMessage(), ex); } - if (ex instanceof CursorNotFound || ex instanceof MongoCursorNotFoundException) { + if (ex instanceof MongoCursorNotFoundException) { return new DataAccessResourceFailureException(ex.getMessage(), ex); } From 921510e54bb5cb046dbf0c8a3c9439fd59625cbd Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Tue, 8 Jul 2014 17:52:32 +0200 Subject: [PATCH 2/2] DATAMONGO-982 - Deprecated IndexOperations.resetIndexCache(). --- .../springframework/data/mongodb/core/IndexOperations.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/IndexOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/IndexOperations.java index a4cb7e820b..e6ddde08b3 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/IndexOperations.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/IndexOperations.java @@ -20,7 +20,6 @@ import org.springframework.data.mongodb.core.index.IndexDefinition; import org.springframework.data.mongodb.core.index.IndexInfo; - /** * Index operations on a collection. * @@ -51,7 +50,10 @@ public interface IndexOperations { /** * Clears all indices that have not yet been applied to this collection. + * + * @deprecated no replacement as the MongoDB Java driver drops that feature with 3.0. */ + @Deprecated void resetIndexCache(); /**