Simplify Geodes.canDeleteByKey() method

immutables · Jun 19, 2019 · 22df373 · 22df373
1 parent ee7a6ce
commit 22df373
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/criteria/geode/src/org/immutables/criteria/geode/GeodeBackend.java b/criteria/geode/src/org/immutables/criteria/geode/GeodeBackend.java
@@ -24,6 +24,7 @@
 import org.immutables.criteria.Repository;
 import org.immutables.criteria.adapter.Backend;
 import org.immutables.criteria.adapter.Operations;
+import org.immutables.criteria.expression.Expression;
 import org.immutables.criteria.expression.Query;
 import org.reactivestreams.Publisher;
 
@@ -88,13 +89,14 @@ private <T> Flowable<Repository.Success> insert(Operations.Insert<T> op) {
 
   private <T> Flowable<Repository.Success> delete(Operations.Delete op) {
     if (!op.query().filter().isPresent()) {
-      // means delete all (ie clear whole region)
+      // no filter means delete all (ie clear whole region)
       return Completable.fromRunnable(region::clear)
               .toSingleDefault(Repository.Success.SUCCESS)
               .toFlowable();
     }
 
-    final Optional<List<?>> ids = Geodes.canDeleteByKey(op.query());
+    final Expression filter = op.query().filter().orElseThrow(() -> new IllegalStateException("For " + op));
+    final Optional<List<?>> ids = Geodes.canDeleteByKey(filter);
     // list of ids is present in the expression
     if (ids.isPresent()) {
       // delete by key: map.remove(key)
@@ -104,8 +106,7 @@ private <T> Flowable<Repository.Success> delete(Operations.Delete op) {
     }
 
 
-    final String predicate = op.query().filter().get()
+    final String predicate = filter.accept(new GeodeQueryVisitor(path -> String.format("e.value.%s", path.toStringPath())));
-            .accept(new GeodeQueryVisitor(path -> String.format("e.value.%s", path.toStringPath())));
 
     final String query = String.format("select distinct e.key from %s.entries e where %s", region.getFullPath(), predicate);
 

diff --git a/criteria/geode/src/org/immutables/criteria/geode/Geodes.java b/criteria/geode/src/org/immutables/criteria/geode/Geodes.java
@@ -18,19 +18,14 @@
 
 import com.google.common.base.Preconditions;
 import org.immutables.criteria.Criteria;
-import org.immutables.criteria.Criterias;
-import org.immutables.criteria.DocumentCriteria;
 import org.immutables.criteria.expression.Call;
 import org.immutables.criteria.expression.Constant;
 import org.immutables.criteria.expression.Expression;
 import org.immutables.criteria.expression.ExpressionConverter;
 import org.immutables.criteria.expression.Operators;
 import org.immutables.criteria.expression.Path;
-import org.immutables.criteria.expression.Query;
 import org.immutables.criteria.expression.Visitors;
 
-import java.lang.reflect.AnnotatedElement;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -67,15 +62,9 @@ static ExpressionConverter<String> converter() {
    *  }
    * </pre>
    *
-   *
+   * @param expr filter applied on entries for deletion
    */
-  static Optional<List<?>> canDeleteByKey(Query query) {
+  static Optional<List<?>> canDeleteByKey(Expression expr) {
-    if (!query.filter().isPresent()) {
-      return Optional.of(Collections.emptyList());
-    }
-
-    final Expression expr = query.filter().get();
-
     if (!(expr instanceof Call)) {
       return Optional.empty();
     }
@@ -97,15 +86,11 @@ static Optional<List<?>> canDeleteByKey(Query query) {
 
     final Path path = Visitors.toPath(predicate.arguments().get(0));
 
-    if (!(path.paths().size() == 1 && isIdAttribute(path.paths().get(0)))) {
+    if (!(path.paths().size() == 1 && path.paths().get(0).isAnnotationPresent(Criteria.Id.class))) {
       return Optional.empty();
     }
 
     final List<Object> values = Visitors.toConstant(predicate.arguments().get(1)).values();
     return Optional.of(values);
   }
-
-  private static boolean isIdAttribute(AnnotatedElement element) {
-    return element.isAnnotationPresent(Criteria.Id.class);
-  }
 }