Update after business refactor

adrienlauer · adrienlauer · commit da43d2f73989 · 2017-09-21T10:55:40.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
@@ -17,7 +17,7 @@
 import org.seedstack.business.domain.AggregateRoot;
 import org.seedstack.business.domain.BaseRepository;
 import org.seedstack.business.specification.Specification;
-import org.seedstack.business.spi.specification.SpecificationTranslator;
+import org.seedstack.business.spi.SpecificationTranslator;
 import org.seedstack.mongodb.morphia.internal.DatastoreFactory;
 import org.seedstack.mongodb.morphia.internal.specification.MorphiaTranslationContext;
 
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
@@ -9,12 +9,12 @@
 
 import org.mongodb.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.AndSpecification;
-import org.seedstack.business.spi.specification.SpecificationConverter;
-import org.seedstack.business.spi.specification.SpecificationTranslator;
+import org.seedstack.business.spi.SpecificationConverter;
+import org.seedstack.business.spi.SpecificationTranslator;
 
 import java.util.Arrays;
 
-public class MorphiaAndConverter implements SpecificationConverter<AndSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
+class MorphiaAndConverter implements SpecificationConverter<AndSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
     public CriteriaContainer convert(AndSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         return context.getQuery().and(
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAttributeConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAttributeConverter.java
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.seedstack.mongodb.morphia.internal.specification;
+
+import org.mongodb.morphia.query.CriteriaContainer;
+import org.seedstack.business.specification.AttributeSpecification;
+import org.seedstack.business.spi.SpecificationConverter;
+import org.seedstack.business.spi.SpecificationTranslator;
+
+class MorphiaAttributeConverter implements SpecificationConverter<AttributeSpecification<?, ?>, MorphiaTranslationContext<?>, CriteriaContainer> {
+    @Override
+    public CriteriaContainer convert(AttributeSpecification<?, ?> 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/MorphiaEqualConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaEqualConverter.java
@@ -9,11 +9,11 @@
 
 import org.mongodb.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.EqualSpecification;
-import org.seedstack.business.spi.specification.SpecificationConverter;
-import org.seedstack.business.spi.specification.SpecificationTranslator;
+import org.seedstack.business.spi.SpecificationConverter;
+import org.seedstack.business.spi.SpecificationTranslator;
 
 
-public class MorphiaEqualConverter implements SpecificationConverter<EqualSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
+class MorphiaEqualConverter implements SpecificationConverter<EqualSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
     public CriteriaContainer convert(EqualSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         if (specification.getExpectedValue() == null) {
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
@@ -10,11 +10,11 @@
 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;
+import org.seedstack.business.spi.SpecificationConverter;
+import org.seedstack.business.spi.SpecificationTranslator;
 
 
-public class MorphiaFalseConverter implements SpecificationConverter<FalseSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
+class MorphiaFalseConverter implements SpecificationConverter<FalseSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
     public CriteriaContainer convert(FalseSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         // Always false
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
@@ -9,11 +9,11 @@
 
 import org.mongodb.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.GreaterThanSpecification;
-import org.seedstack.business.spi.specification.SpecificationConverter;
-import org.seedstack.business.spi.specification.SpecificationTranslator;
+import org.seedstack.business.spi.SpecificationConverter;
+import org.seedstack.business.spi.SpecificationTranslator;
 
 
-public class MorphiaGreaterThanConverter<V extends Comparable<? super V>> implements SpecificationConverter<GreaterThanSpecification<V>, MorphiaTranslationContext<?>, CriteriaContainer> {
+class MorphiaGreaterThanConverter<V extends Comparable<? super V>> implements SpecificationConverter<GreaterThanSpecification<V>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
     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
@@ -10,10 +10,10 @@
 import org.mongodb.morphia.mapping.Mapper;
 import org.mongodb.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.IdentitySpecification;
-import org.seedstack.business.spi.specification.SpecificationConverter;
-import org.seedstack.business.spi.specification.SpecificationTranslator;
+import org.seedstack.business.spi.SpecificationConverter;
+import org.seedstack.business.spi.SpecificationTranslator;
 
-public class MorphiaIdentityConverter implements SpecificationConverter<IdentitySpecification<?, ?>, MorphiaTranslationContext<?>, CriteriaContainer> {
+class MorphiaIdentityConverter implements SpecificationConverter<IdentitySpecification<?, ?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
     public CriteriaContainer convert(IdentitySpecification<?, ?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         context.setFieldEnd(Mapper.ID_KEY);
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
@@ -9,11 +9,11 @@
 
 import org.mongodb.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.LessThanSpecification;
-import org.seedstack.business.spi.specification.SpecificationConverter;
-import org.seedstack.business.spi.specification.SpecificationTranslator;
+import org.seedstack.business.spi.SpecificationConverter;
+import org.seedstack.business.spi.SpecificationTranslator;
 
 
-public class MorphiaLessThanConverter<V extends Comparable<? super V>> implements SpecificationConverter<LessThanSpecification<V>, MorphiaTranslationContext<?>, CriteriaContainer> {
+class MorphiaLessThanConverter<V extends Comparable<? super V>> implements SpecificationConverter<LessThanSpecification<V>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
     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
@@ -9,10 +9,10 @@
 
 import org.mongodb.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.NotSpecification;
-import org.seedstack.business.spi.specification.SpecificationConverter;
-import org.seedstack.business.spi.specification.SpecificationTranslator;
+import org.seedstack.business.spi.SpecificationConverter;
+import org.seedstack.business.spi.SpecificationTranslator;
 
-public class MorphiaNotConverter implements SpecificationConverter<NotSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
+class MorphiaNotConverter implements SpecificationConverter<NotSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
     public CriteriaContainer convert(NotSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         context.not();
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
@@ -9,12 +9,12 @@
 
 import org.mongodb.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.OrSpecification;
-import org.seedstack.business.spi.specification.SpecificationConverter;
-import org.seedstack.business.spi.specification.SpecificationTranslator;
+import org.seedstack.business.spi.SpecificationConverter;
+import org.seedstack.business.spi.SpecificationTranslator;
 
 import java.util.Arrays;
 
-public class MorphiaOrConverter implements SpecificationConverter<OrSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
+class MorphiaOrConverter implements SpecificationConverter<OrSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
     public CriteriaContainer convert(OrSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         return context.getQuery().or(
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
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
@@ -9,9 +9,9 @@
 
 import org.mongodb.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.Specification;
-import org.seedstack.business.spi.specification.BaseSpecificationTranslator;
+import org.seedstack.business.spi.BaseSpecificationTranslator;
 
-public class MorphiaSpecificationTranslator extends BaseSpecificationTranslator<MorphiaTranslationContext, CriteriaContainer> {
+class MorphiaSpecificationTranslator extends BaseSpecificationTranslator<MorphiaTranslationContext, CriteriaContainer> {
     @Override
     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
@@ -9,12 +9,12 @@
 
 import org.mongodb.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.StringSpecification;
-import org.seedstack.business.spi.specification.SpecificationConverter;
-import org.seedstack.business.spi.specification.SpecificationTranslator;
+import org.seedstack.business.spi.SpecificationConverter;
+import org.seedstack.business.spi.SpecificationTranslator;
 
 import java.util.regex.Pattern;
 
-public abstract class MorphiaStringConverter<S extends StringSpecification> implements SpecificationConverter<S, MorphiaTranslationContext<?>, CriteriaContainer> {
+abstract class MorphiaStringConverter<S extends StringSpecification> implements SpecificationConverter<S, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
     public CriteriaContainer convert(S specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         if (specification.getExpectedString() == null) {
@@ -35,22 +35,22 @@ public CriteriaContainer convert(S specification, MorphiaTranslationContext<?> c
     private Pattern buildRegex(StringSpecification.Options options, String expectedString) {
         StringBuilder sb = new StringBuilder();
         sb.append("^");
-        if (options.isTrimmed() || options.isLeftTrimmed()) {
+        if (options.isTrimmed() || options.isLeadTrimmed()) {
             sb.append("\\s*");
         }
         sb.append(buildRegexMatchingPart(expectedString));
-        if (options.isTrimmed() || options.isRightTrimmed()) {
+        if (options.isTrimmed() || options.isTailTrimmed()) {
             sb.append("\\s*");
         }
         sb.append("$");
         return Pattern.compile(sb.toString(), options.isIgnoringCase() ? Pattern.CASE_INSENSITIVE : 0);
     }
 
     private boolean hasNoOption(StringSpecification.Options options) {
-        return !options.isLeftTrimmed() && !options.isRightTrimmed() && !options.isTrimmed() && !options.isIgnoringCase();
+        return !options.isLeadTrimmed() && !options.isTailTrimmed() && !options.isTrimmed() && !options.isIgnoringCase();
     }
 
-    protected abstract String buildRegexMatchingPart(String value);
+    abstract String buildRegexMatchingPart(String value);
 
-    protected abstract boolean isRegex();
+    abstract boolean isRegex();
 }
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,14 +12,14 @@
 import java.util.regex.Pattern;
 
 
-public class MorphiaStringEqualConverter extends MorphiaStringConverter<StringEqualSpecification> {
+class MorphiaStringEqualConverter extends MorphiaStringConverter<StringEqualSpecification> {
     @Override
-    protected String buildRegexMatchingPart(String value) {
+    String buildRegexMatchingPart(String value) {
         return Pattern.quote(value);
     }
 
     @Override
-    protected boolean isRegex() {
+    boolean isRegex() {
         return false;
     }
 }
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,16 +10,16 @@
 import org.seedstack.business.specification.StringMatchingSpecification;
 
 
-public class MorphiaStringMatchingConverter extends MorphiaStringConverter<StringMatchingSpecification> {
+class MorphiaStringMatchingConverter extends MorphiaStringConverter<StringMatchingSpecification> {
     @Override
-    protected String buildRegexMatchingPart(String value) {
+    String buildRegexMatchingPart(String value) {
         return value
                 .replace(StringMatchingSpecification.SINGLE_CHARACTER_WILDCARD, ".")
                 .replace(StringMatchingSpecification.MULTI_CHARACTER_WILDCARD, ".*");
     }
 
     @Override
-    protected boolean isRegex() {
+    boolean isRegex() {
         return true;
     }
 }
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
@@ -22,14 +22,14 @@ public MorphiaTranslationContext(Query<T> query) {
         this.query = query;
     }
 
-    FieldEnd<? extends CriteriaContainer> pickFieldEnd() {
+    public FieldEnd<? extends CriteriaContainer> pickFieldEnd() {
         checkState(this.fieldEnd != null, "No field has been set");
         FieldEnd<? extends CriteriaContainer> result = this.fieldEnd;
         this.fieldEnd = null;
         return result;
     }
 
-    void setFieldEnd(String property) {
+    public void setFieldEnd(String property) {
         checkState(this.fieldEnd == null, "A field is already set");
         if (not) {
             this.fieldEnd = query.criteria(property).not();
@@ -39,11 +39,11 @@ void setFieldEnd(String property) {
         this.not = false;
     }
 
-    void not() {
+    public void not() {
         not = !not;
     }
 
-    Query<T> getQuery() {
+    public Query<T> getQuery() {
         return 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
@@ -10,11 +10,11 @@
 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;
+import org.seedstack.business.spi.SpecificationConverter;
+import org.seedstack.business.spi.SpecificationTranslator;
 
 
-public class MorphiaTrueConverter implements SpecificationConverter<TrueSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
+class MorphiaTrueConverter implements SpecificationConverter<TrueSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
     public CriteriaContainer convert(TrueSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
         // Always true
