Merge pull request #268 from ipavkovic/master

add support for different DuplicateKeyException behavior between mong…

Author: twillouer

src/main/java/com/github/fakemongo/Fongo.java

@@ -47,6 +47,7 @@ public class Fongo implements OperationExecutor {
   private final static Logger LOG = LoggerFactory.getLogger(Fongo.class);
 
   public static final ServerVersion V3_2_SERVER_VERSION = new ServerVersion(3, 2);
+  public static final ServerVersion V3_3_SERVER_VERSION = new ServerVersion(3, 3);
   public static final ServerVersion V3_SERVER_VERSION = new ServerVersion(3, 0);
   public static final ServerVersion OLD_SERVER_VERSION = new ServerVersion(0, 0);
   public static final ServerVersion DEFAULT_SERVER_VERSION = V3_2_SERVER_VERSION;

src/main/java/com/mongodb/FongoDB.java

@@ -21,6 +21,7 @@
 import com.github.fakemongo.impl.Aggregator;
 import com.github.fakemongo.impl.ExpressionParser;
 import com.github.fakemongo.impl.geo.GeoUtil;
+import com.mongodb.connection.ServerVersion;
 import com.mongodb.util.JSON;
 import com.vividsolutions.jts.geom.Coordinate;
 
@@ -442,6 +443,28 @@ public WriteConcernException writeConcernException(int code, String err) {
     return new WriteConcernException(result, fongo.getServerAddress(), WriteConcernResult.unacknowledged());
   }
 
+  public WriteConcernException duplicateKeyException(int code, String err, DBObject oldObject) {
+    if(serverIsAtLeastThreeDotThree(this.fongo)) {
+      throw duplicateKeyException(code, err);
+    } else {
+      if (oldObject == null) {
+        // insert
+        throw duplicateKeyException(code, err);
+      } else {
+        // update (MongoDB throws a different exception in case of an update, see issue #200)
+        throw mongoCommandException(code, err);
+      }
+    }
+  }
+
+  private boolean serverIsAtLeastThreeDotThree(Fongo fongo) {
+    return serverIsAtLeastVersion(fongo, Fongo.V3_3_SERVER_VERSION);
+  }
+
+  static boolean serverIsAtLeastVersion(Fongo fongo, final ServerVersion serverVersion) {
+    return fongo.getServerVersion().compareTo(serverVersion) >= 0;
+  }
+
   public WriteConcernException duplicateKeyException(int code, String err) {
     final BsonDocument result = bsonResultNotOk(code, err);
     return new DuplicateKeyException(result, fongo.getServerAddress(), WriteConcernResult.unacknowledged());

src/main/java/com/mongodb/FongoDBCollection.java

@@ -1368,14 +1368,7 @@ private void addToIndexes(DBObject object, DBObject oldObject, WriteConcern conc
       if (!error.isEmpty()) {
         // TODO formatting : E11000 duplicate key error index: test.zip.$city_1_state_1_pop_1  dup key: { : "BARRE", : "MA", : 4546.0 }
         if (enforceDuplicates(concern)) {
-          String err = "E11000 duplicate key error index: " + this.getFullName() + "." + index.getName() + "  dup key : {" + error + " }";
-          if (oldObject == null) {
-            // insert
-            throw fongoDb.duplicateKeyException(11000, err);
-          } else {
-            // update (MongoDB throws a different exception in case of an update, see issue #200)
-            throw fongoDb.mongoCommandException(11000, err);
-          }
+          throw fongoDb.duplicateKeyException(11000, "E11000 duplicate key error index: " + this.getFullName() + "." + index.getName() + "  dup key : {" + error + " }", oldObject);
         }
         return; // silently ignore.
       }

src/test/java/com/github/fakemongo/AbstractFongoV3Test.java

@@ -389,19 +389,6 @@ public void deleteOne_remove_must_throw_exception_with_unacknowledged() {
     deleteResult.getDeletedCount();
   }
 
-  @Test
-  public void insertOneWithDuplicateValueForUniqueColumn_throwsMongoCommandException() {
-    // Given
-    MongoCollection collection = newCollection();
-    collection.createIndex(new Document("a", 1), new IndexOptions().name("a").unique(true));
-    collection.insertOne(new Document("_id", 1).append("a", 1));
-    collection.insertOne(new Document("_id", 2).append("a", 2));
-
-    // When
-    exception.expect(MongoCommandException.class);
-    collection.findOneAndUpdate(docId(2), new Document("$set", new Document("a", 1)));
-  }
-
   @Test
   public void deleteMany_remove_many() {
     // Given
@@ -1186,7 +1173,7 @@ public void shouldFindOneDocumentWithoutTheOptionalFieldWithIndex() {
     Assertions.assertThat(collection.count()).isEqualTo(1);
   }
 
-  private Document docId(final Object value) {
+  protected static Document docId(final Object value) {
     return new Document("_id", value);
   }
 

src/test/java/com/github/fakemongo/FongoV3ServerVersion3_2Test.java

@@ -1,11 +1,29 @@
 package com.github.fakemongo;
 
+import com.mongodb.MongoCommandException;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.IndexOptions;
 import com.mongodb.connection.ServerVersion;
+import org.bson.Document;
+import org.junit.Test;
 
 public class FongoV3ServerVersion3_2Test extends AbstractFongoV3Test {
 
   @Override
   public ServerVersion serverVersion() {
     return Fongo.V3_2_SERVER_VERSION;
   }
+
+    @Test
+    public void insertOneWithDuplicateValueForUniqueColumn_throwsMongoCommandException() {
+        // Given
+        MongoCollection collection = newCollection();
+        collection.createIndex(new Document("a", 1), new IndexOptions().name("a").unique(true));
+        collection.insertOne(new Document("_id", 1).append("a", 1));
+        collection.insertOne(new Document("_id", 2).append("a", 2));
+
+        // When
+        exception.expect(MongoCommandException.class);
+        collection.findOneAndUpdate(docId(2), new Document("$set", new Document("a", 1)));
+    }
 }

src/test/java/com/github/fakemongo/FongoV3ServerVersion3_3Test.java

@@ -0,0 +1,29 @@
+package com.github.fakemongo;
+
+import com.mongodb.DuplicateKeyException;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.IndexOptions;
+import com.mongodb.connection.ServerVersion;
+import org.bson.Document;
+import org.junit.Test;
+
+public class FongoV3ServerVersion3_3Test extends AbstractFongoV3Test {
+
+  @Override
+  public ServerVersion serverVersion() {
+    return Fongo.V3_3_SERVER_VERSION;
+  }
+
+    @Test
+    public void insertOneWithDuplicateValueForUniqueColumn_throwsDuplicateKeyException() {
+        // Given
+        MongoCollection collection = newCollection();
+        collection.createIndex(new Document("a", 1), new IndexOptions().name("a").unique(true));
+        collection.insertOne(new Document("_id", 1).append("a", 1));
+        collection.insertOne(new Document("_id", 2).append("a", 2));
+
+        // When
+        exception.expect(DuplicateKeyException.class);
+        collection.findOneAndUpdate(docId(2), new Document("$set", new Document("a", 1)));
+    }
+}