Fully implemented base repository

adrienlauer · adrienlauer · commit 9779f5abc2dd · 2017-09-13T21:20:09.000+02:00
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java
@@ -8,7 +8,6 @@
 package org.seedstack.mongodb.morphia;
 
 import org.mongodb.morphia.Datastore;
-import org.mongodb.morphia.mapping.Mapper;
 import org.mongodb.morphia.query.CriteriaContainer;
 import org.mongodb.morphia.query.Query;
 import org.seedstack.business.domain.AggregateExistsException;
@@ -18,7 +17,7 @@
 import org.seedstack.business.specification.Specification;
 import org.seedstack.business.spi.specification.SpecificationTranslator;
 import org.seedstack.mongodb.morphia.internal.DatastoreFactory;
-import org.seedstack.mongodb.morphia.internal.specification.MorphiaQueryContext;
+import org.seedstack.mongodb.morphia.internal.specification.MorphiaTranslationContext;
 
 import javax.inject.Inject;
 import java.util.Optional;
@@ -33,7 +32,7 @@
  */
 public abstract class BaseMorphiaRepository<A extends AggregateRoot<ID>, ID> extends BaseRepository<A, ID> {
     private Datastore datastore;
-    private SpecificationTranslator<MorphiaQueryContext, CriteriaContainer> specificationTranslator;
+    private SpecificationTranslator<MorphiaTranslationContext, CriteriaContainer> specificationTranslator;
 
     public BaseMorphiaRepository() {
 
@@ -44,7 +43,7 @@ public BaseMorphiaRepository(Class<A> aggregateRootClass, Class<ID> kClass) {
     }
 
     @Inject
-    private void init(DatastoreFactory datastoreFactory, SpecificationTranslator<MorphiaQueryContext, CriteriaContainer> specificationTranslator) {
+    private void init(DatastoreFactory datastoreFactory, SpecificationTranslator<MorphiaTranslationContext, CriteriaContainer> specificationTranslator) {
         this.datastore = datastoreFactory.createDatastore(getAggregateRootClass());
         this.specificationTranslator = specificationTranslator;
     }
@@ -65,34 +64,22 @@ public void add(A aggregate) throws AggregateExistsException {
 
     @Override
     public Stream<A> get(Specification<A> specification, Option... options) {
-        Query<A> query = datastore.createQuery(getAggregateRootClass());
-        specificationTranslator.translate(
-                specification,
-                new MorphiaQueryContext<>(query)
-        );
-        return query.asList().stream();
+        return buildQuery(specification).asList().stream();
     }
 
     @Override
     public Optional<A> get(ID id) {
         return Optional.ofNullable(datastore.get(getAggregateRootClass(), id));
     }
 
-    @Override
-    public boolean contains(Specification<A> specification) {
-        // TODO
-        return false;
-    }
-
     @Override
     public boolean contains(ID id) {
-        return datastore.find(getAggregateRootClass()).filter(Mapper.ID_KEY, id).getKey() != null;
+        return datastore.exists(id) != null;
     }
 
     @Override
     public long count(Specification<A> specification) {
-        // TODO
-        return 0;
+        return buildQuery(specification).count();
     }
 
     @Override
@@ -102,8 +89,8 @@ public long size() {
 
     @Override
     public long remove(Specification<A> specification) throws AggregateNotFoundException {
-        // TODO
-        return 0;
+        Query<A> query = buildQuery(specification);
+        return datastore.delete(query).getN();
     }
 
     @Override
@@ -137,4 +124,13 @@ public void clear() {
         datastore.getCollection(getAggregateRootClass()).drop();
         datastore.getCollection(getAggregateRootClass()).dropIndexes();
     }
+
+    private Query<A> buildQuery(Specification<A> specification) {
+        Query<A> query = datastore.createQuery(getAggregateRootClass());
+        specificationTranslator.translate(
+                specification,
+                new MorphiaTranslationContext<>(query)
+        );
+        return query;
+    }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAndConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAndConverter.java
@@ -14,9 +14,9 @@
 
 import java.util.Arrays;
 
-public class MorphiaAndConverter<T, V> implements SpecificationConverter<AndSpecification<V>, MorphiaQueryContext<T>, CriteriaContainer> {
+public class MorphiaAndConverter implements SpecificationConverter<AndSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
-    public CriteriaContainer convert(AndSpecification<V> specification, MorphiaQueryContext<T> context, SpecificationTranslator<MorphiaQueryContext<T>, CriteriaContainer> translator) {
+    public CriteriaContainer convert(AndSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         return context.getQuery().and(
                 Arrays.stream(specification.getSpecifications())
                         .map(spec -> translator.translate(spec, context))
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaEqualConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaEqualConverter.java
@@ -13,9 +13,9 @@
 import org.seedstack.business.spi.specification.SpecificationTranslator;
 
 
-public class MorphiaEqualConverter<T, V> implements SpecificationConverter<EqualSpecification<V>, MorphiaQueryContext<T>, CriteriaContainer> {
+public class MorphiaEqualConverter implements SpecificationConverter<EqualSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
-    public CriteriaContainer convert(EqualSpecification<V> specification, MorphiaQueryContext<T> context, SpecificationTranslator<MorphiaQueryContext<T>, CriteriaContainer> translator) {
+    public CriteriaContainer convert(EqualSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         if (specification.getExpectedValue() == null) {
             return context.pickFieldEnd().doesNotExist();
         } else {
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaFalseConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaFalseConverter.java
@@ -7,16 +7,17 @@
  */
 package org.seedstack.mongodb.morphia.internal.specification;
 
+import org.mongodb.morphia.mapping.Mapper;
 import org.mongodb.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.FalseSpecification;
 import org.seedstack.business.spi.specification.SpecificationConverter;
 import org.seedstack.business.spi.specification.SpecificationTranslator;
 
 
-public class MorphiaFalseConverter<T, V> implements SpecificationConverter<FalseSpecification<V>, MorphiaQueryContext<T>, CriteriaContainer> {
+public class MorphiaFalseConverter implements SpecificationConverter<FalseSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
-    public CriteriaContainer convert(FalseSpecification<V> specification, MorphiaQueryContext<T> context, SpecificationTranslator<MorphiaQueryContext<T>, CriteriaContainer> translator) {
+    public CriteriaContainer convert(FalseSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         // Always false
-        return context.getQuery().criteria("_id").doesNotExist();
+        return context.getQuery().criteria(Mapper.ID_KEY).doesNotExist();
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaGreaterThanConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaGreaterThanConverter.java
@@ -13,9 +13,9 @@
 import org.seedstack.business.spi.specification.SpecificationTranslator;
 
 
-public class MorphiaGreaterThanConverter<T, V extends Comparable<? super V>> implements SpecificationConverter<GreaterThanSpecification<V>, MorphiaQueryContext<T>, CriteriaContainer> {
+public class MorphiaGreaterThanConverter<V extends Comparable<? super V>> implements SpecificationConverter<GreaterThanSpecification<V>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
-    public CriteriaContainer convert(GreaterThanSpecification<V> specification, MorphiaQueryContext<T> context, SpecificationTranslator<MorphiaQueryContext<T>, CriteriaContainer> translator) {
+    public CriteriaContainer convert(GreaterThanSpecification<V> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         return context.pickFieldEnd().greaterThan(specification.getExpectedValue());
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaIdentityConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaIdentityConverter.java
@@ -7,16 +7,16 @@
  */
 package org.seedstack.mongodb.morphia.internal.specification;
 
+import org.mongodb.morphia.mapping.Mapper;
 import org.mongodb.morphia.query.CriteriaContainer;
-import org.seedstack.business.domain.AggregateRoot;
 import org.seedstack.business.specification.IdentitySpecification;
 import org.seedstack.business.spi.specification.SpecificationConverter;
 import org.seedstack.business.spi.specification.SpecificationTranslator;
 
-public class MorphiaIdentityConverter<A extends AggregateRoot<ID>, ID> implements SpecificationConverter<IdentitySpecification<A, ID>, MorphiaQueryContext<A>, CriteriaContainer> {
+public class MorphiaIdentityConverter implements SpecificationConverter<IdentitySpecification<?, ?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
-    public CriteriaContainer convert(IdentitySpecification<A, ID> specification, MorphiaQueryContext<A> context, SpecificationTranslator<MorphiaQueryContext<A>, CriteriaContainer> translator) {
-        context.setFieldEnd("_id");
+    public CriteriaContainer convert(IdentitySpecification<?, ?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
+        context.setFieldEnd(Mapper.ID_KEY);
         // We avoid using equal() because Morphia optimizes it without operator ("someAttr": "someVal")
         // Thus generating an invalid query when trying to negate it ("$not": "someVal")
         return context.pickFieldEnd().not().notEqual(specification.getExpectedIdentifier());
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaLessThanConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaLessThanConverter.java
@@ -13,9 +13,9 @@
 import org.seedstack.business.spi.specification.SpecificationTranslator;
 
 
-public class MorphiaLessThanConverter<T, V extends Comparable<? super V>> implements SpecificationConverter<LessThanSpecification<V>, MorphiaQueryContext<T>, CriteriaContainer> {
+public class MorphiaLessThanConverter<V extends Comparable<? super V>> implements SpecificationConverter<LessThanSpecification<V>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
-    public CriteriaContainer convert(LessThanSpecification<V> specification, MorphiaQueryContext<T> context, SpecificationTranslator<MorphiaQueryContext<T>, CriteriaContainer> translator) {
+    public CriteriaContainer convert(LessThanSpecification<V> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         return context.pickFieldEnd().lessThan(specification.getExpectedValue());
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaNotConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaNotConverter.java
@@ -12,9 +12,9 @@
 import org.seedstack.business.spi.specification.SpecificationConverter;
 import org.seedstack.business.spi.specification.SpecificationTranslator;
 
-public class MorphiaNotConverter<T, V> implements SpecificationConverter<NotSpecification<V>, MorphiaQueryContext<T>, CriteriaContainer> {
+public class MorphiaNotConverter implements SpecificationConverter<NotSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
-    public CriteriaContainer convert(NotSpecification<V> specification, MorphiaQueryContext<T> context, SpecificationTranslator<MorphiaQueryContext<T>, CriteriaContainer> translator) {
+    public CriteriaContainer convert(NotSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         context.not();
         return translator.translate(specification.getSpecification(), context);
     }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaOrConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaOrConverter.java
@@ -14,9 +14,9 @@
 
 import java.util.Arrays;
 
-public class MorphiaOrConverter<T, V> implements SpecificationConverter<OrSpecification<V>, MorphiaQueryContext<T>, CriteriaContainer> {
+public class MorphiaOrConverter implements SpecificationConverter<OrSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
-    public CriteriaContainer convert(OrSpecification<V> specification, MorphiaQueryContext<T> context, SpecificationTranslator<MorphiaQueryContext<T>, CriteriaContainer> translator) {
+    public CriteriaContainer convert(OrSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         return context.getQuery().or(
                 Arrays.stream(specification.getSpecifications())
                         .map(spec -> translator.translate(spec, context))
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaPropertyConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaPropertyConverter.java
@@ -12,9 +12,9 @@
 import org.seedstack.business.spi.specification.SpecificationConverter;
 import org.seedstack.business.spi.specification.SpecificationTranslator;
 
-public class MorphiaPropertyConverter<T> implements SpecificationConverter<PropertySpecification<T, ?>, MorphiaQueryContext<T>, CriteriaContainer> {
+public class MorphiaPropertyConverter implements SpecificationConverter<PropertySpecification<?, ?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
-    public CriteriaContainer convert(PropertySpecification<T, ?> specification, MorphiaQueryContext<T> context, SpecificationTranslator<MorphiaQueryContext<T>, CriteriaContainer> translator) {
+    public CriteriaContainer convert(PropertySpecification<?, ?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         context.setFieldEnd(specification.getPath());
         return translator.translate(specification.getValueSpecification(), context);
     }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaSpecificationTranslator.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaSpecificationTranslator.java
@@ -11,9 +11,9 @@
 import org.seedstack.business.specification.Specification;
 import org.seedstack.business.spi.specification.BaseSpecificationTranslator;
 
-public class MorphiaSpecificationTranslator extends BaseSpecificationTranslator<MorphiaQueryContext, CriteriaContainer> {
+public class MorphiaSpecificationTranslator extends BaseSpecificationTranslator<MorphiaTranslationContext, CriteriaContainer> {
     @Override
-    public <T> CriteriaContainer translate(Specification<T> specification, MorphiaQueryContext query) {
+    public <S extends Specification<?>> CriteriaContainer translate(S specification, MorphiaTranslationContext query) {
         return convert(specification, query);
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringConverter.java
@@ -14,9 +14,9 @@
 
 import java.util.regex.Pattern;
 
-public abstract class MorphiaStringConverter<T, S extends StringSpecification> implements SpecificationConverter<S, MorphiaQueryContext<T>, CriteriaContainer> {
+public abstract class MorphiaStringConverter<S extends StringSpecification> implements SpecificationConverter<S, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
-    public CriteriaContainer convert(S specification, MorphiaQueryContext<T> context, SpecificationTranslator<MorphiaQueryContext<T>, CriteriaContainer> translator) {
+    public CriteriaContainer convert(S specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         if (specification.getExpectedString() == null) {
             return context.pickFieldEnd().doesNotExist();
         } else {
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringEqualConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringEqualConverter.java
@@ -12,7 +12,7 @@
 import java.util.regex.Pattern;
 
 
-public class MorphiaStringEqualConverter<T> extends MorphiaStringConverter<T, StringEqualSpecification> {
+public class MorphiaStringEqualConverter extends MorphiaStringConverter<StringEqualSpecification> {
     @Override
     protected String buildRegexMatchingPart(String value) {
         return Pattern.quote(value);
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringMatchingConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringMatchingConverter.java
@@ -10,7 +10,7 @@
 import org.seedstack.business.specification.StringMatchingSpecification;
 
 
-public class MorphiaStringMatchingConverter<T> extends MorphiaStringConverter<T, StringMatchingSpecification> {
+public class MorphiaStringMatchingConverter extends MorphiaStringConverter<StringMatchingSpecification> {
     @Override
     protected String buildRegexMatchingPart(String value) {
         return value
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTranslationContext.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTranslationContext.java
@@ -13,12 +13,12 @@
 
 import static com.google.common.base.Preconditions.checkState;
 
-public class MorphiaQueryContext<T> {
+public class MorphiaTranslationContext<T> {
     private final Query<T> query;
     private FieldEnd<? extends CriteriaContainer> fieldEnd;
     private boolean not;
 
-    public MorphiaQueryContext(Query<T> query) {
+    public MorphiaTranslationContext(Query<T> query) {
         this.query = query;
     }
 
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTrueConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTrueConverter.java
@@ -7,16 +7,17 @@
  */
 package org.seedstack.mongodb.morphia.internal.specification;
 
+import org.mongodb.morphia.mapping.Mapper;
 import org.mongodb.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.TrueSpecification;
 import org.seedstack.business.spi.specification.SpecificationConverter;
 import org.seedstack.business.spi.specification.SpecificationTranslator;
 
 
-public class MorphiaTrueConverter<T, V> implements SpecificationConverter<TrueSpecification<V>, MorphiaQueryContext<T>, CriteriaContainer> {
+public class MorphiaTrueConverter implements SpecificationConverter<TrueSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
-    public CriteriaContainer convert(TrueSpecification<V> specification, MorphiaQueryContext<T> context, SpecificationTranslator<MorphiaQueryContext<T>, CriteriaContainer> translator) {
+    public CriteriaContainer convert(TrueSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         // Always true
-        return context.getQuery().criteria("_id").not().doesNotExist();
+        return context.getQuery().criteria(Mapper.ID_KEY).not().doesNotExist();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@`
`13`	`13`	`import org.seedstack.business.spi.specification.SpecificationTranslator;`
`14`	`14`
`15`	`15`
`16`		`-public class MorphiaGreaterThanConverter<T, V extends Comparable<? super V>> implements SpecificationConverter<GreaterThanSpecification<V>, MorphiaQueryContext<T>, CriteriaContainer> {`
	`16`	`+public class MorphiaGreaterThanConverter<V extends Comparable<? super V>> implements SpecificationConverter<GreaterThanSpecification<V>, MorphiaTranslationContext<?>, CriteriaContainer> {`
`17`	`17`	`@Override`
`18`		`- public CriteriaContainer convert(GreaterThanSpecification<V> specification, MorphiaQueryContext<T> context, SpecificationTranslator<MorphiaQueryContext<T>, CriteriaContainer> translator) {`
	`18`	`+ public CriteriaContainer convert(GreaterThanSpecification<V> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {`
`19`	`19`	`return context.pickFieldEnd().greaterThan(specification.getExpectedValue());`
`20`	`20`	`}`
`21`	`21`	`}`