Fix BaseMorphiaRepository contains

Author: adrienlauer

morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java

@@ -8,6 +8,8 @@
 package org.seedstack.mongodb.morphia;
 
 import org.mongodb.morphia.Datastore;
+import org.mongodb.morphia.mapping.Mapper;
+import org.mongodb.morphia.query.CountOptions;
 import org.mongodb.morphia.query.CriteriaContainer;
 import org.mongodb.morphia.query.Query;
 import org.seedstack.business.domain.AggregateExistsException;
@@ -72,9 +74,14 @@ public Optional<A> get(ID id) {
         return Optional.ofNullable(datastore.get(getAggregateRootClass(), id));
     }
 
+    @Override
+    public boolean contains(Specification<A> specification) {
+        return buildQuery(specification).count(new CountOptions().limit(1)) > 0;
+    }
+
     @Override
     public boolean contains(ID id) {
-        return datastore.exists(id) != null;
+        return datastore.find(getAggregateRootClass()).filter(Mapper.ID_KEY, id).count(new CountOptions().limit(1)) > 0;
     }
 
     @Override
@@ -89,20 +96,14 @@ public long size() {
 
     @Override
     public long remove(Specification<A> specification) throws AggregateNotFoundException {
-        Query<A> query = buildQuery(specification);
-        return datastore.delete(query).getN();
+        return datastore.delete(buildQuery(specification)).getN();
     }
 
     @Override
     public void remove(ID id) throws AggregateNotFoundException {
         checkExactlyOneAggregateRemoved(datastore.delete(getAggregateRootClass(), id).getN(), id);
     }
 
-    @Override
-    public void remove(A aggregate) throws AggregateNotFoundException {
-        checkExactlyOneAggregateRemoved(datastore.delete(aggregate).getN(), aggregate.getId());
-    }
-
     private void checkExactlyOneAggregateRemoved(int n, ID id) {
         if (n == 0) {
             throw new AggregateNotFoundException("Non-existent aggregate " + getAggregateRootClass().getSimpleName() + " identified with " + id + " cannot be removed");