updates query

eclipse · Sep 9, 2019 · c786162 · c786162
1 parent f61d1cb
commit c786162
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/diana/diana-query/src/main/java/org/eclipse/jnosql/diana/query/AntlrRemoveQueryProvider.java b/diana/diana-query/src/main/java/org/eclipse/jnosql/diana/query/AntlrRemoveQueryProvider.java
@@ -13,8 +13,8 @@
 
 
 import jakarta.nosql.query.QueryValue;
-import jakarta.nosql.query.RemoveQuery;
-import jakarta.nosql.query.RemoveQuery.RemoveQueryProvider;
+import jakarta.nosql.query.DelQuery;
+import jakarta.nosql.query.DelQuery.DelQueryProvider;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.Collections;
@@ -24,9 +24,9 @@
 import static java.util.stream.Collectors.toList;
 
 /**
- * The {@link RemoveQueryProvider} implementation that uses Antlr4
+ * The {@link DelQueryProvider} implementation that uses Antlr4
  */
-public final class AntlrRemoveQueryProvider extends AbstractSupplier implements RemoveQueryProvider {
+public final class AntlrRemoveQueryProvider extends AbstractSupplier implements DelQueryProvider {
 
     private List<QueryValue<?>> keys = Collections.emptyList();
 
@@ -37,11 +37,11 @@ public void exitKeys(QueryParser.KeysContext ctx) {
 
     @Override
     Function<QueryParser, ParseTree> getParserTree() {
-        return QueryParser::remove;
+        return QueryParser::del;
     }
 
     @Override
-    public RemoveQuery apply(String query) {
+    public DelQuery apply(String query) {
         runQuery(query);
         return new DefaultRemoveQuery(keys);
     }

diff --git a/diana/diana-query/src/main/java/org/eclipse/jnosql/diana/query/DefaultRemoveQuery.java b/diana/diana-query/src/main/java/org/eclipse/jnosql/diana/query/DefaultRemoveQuery.java
@@ -11,15 +11,15 @@
  */
 package org.eclipse.jnosql.diana.query;
 
-import jakarta.nosql.query.RemoveQuery;
+import jakarta.nosql.query.DelQuery;
 import jakarta.nosql.query.QueryValue;
 
 import java.util.List;
 import java.util.Objects;
 
 import static java.util.Collections.unmodifiableList;
 
-final class DefaultRemoveQuery implements RemoveQuery {
+final class DefaultRemoveQuery implements DelQuery {
 
     private final List<QueryValue<?>> keys;
 

diff --git a/...uery/cache/CachedRemoveQueryProvider.java → ...a/query/cache/CachedDelQueryProvider.java b/...uery/cache/CachedRemoveQueryProvider.java → ...a/query/cache/CachedDelQueryProvider.java
@@ -11,26 +11,26 @@
  */
 package org.eclipse.jnosql.diana.query.cache;
 
-import jakarta.nosql.query.RemoveQuery;
-import jakarta.nosql.query.RemoveQuery.RemoveQueryProvider;
+import jakarta.nosql.query.DelQuery;
+import jakarta.nosql.query.DelQuery.DelQueryProvider;
 import org.eclipse.jnosql.diana.query.AntlrRemoveQueryProvider;
 
 import java.util.Objects;
 
 /**
  * The {@link AntlrRemoveQueryProvider} cache wrapper.
  */
-public final class CachedRemoveQueryProvider implements RemoveQueryProvider {
+public final class CachedDelQueryProvider implements DelQueryProvider {
 
-    private final CacheQuery<RemoveQuery> cached;
+    private final CacheQuery<DelQuery> cached;
 
 
-    public CachedRemoveQueryProvider() {
+    public CachedDelQueryProvider() {
         this.cached = CacheQuery.of(q -> new AntlrRemoveQueryProvider().apply(q));
     }
 
     @Override
-    public RemoveQuery apply(String query) {
+    public DelQuery apply(String query) {
         Objects.requireNonNull(query, "query is required");
         return cached.get(query);
     }

diff --git a/...-query/src/main/resources/META-INF/services/jakarta.nosql.query.DelQuery$DelQueryProvider b/...-query/src/main/resources/META-INF/services/jakarta.nosql.query.DelQuery$DelQueryProvider
@@ -0,0 +1 @@
+org.eclipse.jnosql.diana.query.cache.CachedDelQueryProvider
diff --git a/.../src/main/resources/META-INF/services/jakarta.nosql.query.RemoveQuery$RemoveQueryProvider b/.../src/main/resources/META-INF/services/jakarta.nosql.query.RemoveQuery$RemoveQueryProvider
diff --git a/...-query/src/test/java/org/eclipse/jnosql/diana/query/provider/RemoveQueryProviderTest.java b/...-query/src/test/java/org/eclipse/jnosql/diana/query/provider/RemoveQueryProviderTest.java
@@ -13,7 +13,7 @@
 
 import jakarta.nosql.ServiceLoaderProvider;
 import jakarta.nosql.query.RemoveQuery.RemoveQueryProvider;
-import org.eclipse.jnosql.diana.query.cache.CachedRemoveQueryProvider;
+import org.eclipse.jnosql.diana.query.cache.CachedDelQueryProvider;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -23,6 +23,6 @@ public class RemoveQueryProviderTest {
     public void shouldGetSupplier() {
         RemoveQueryProvider supplier = ServiceLoaderProvider.get(RemoveQueryProvider.class);
         Assertions.assertNotNull(supplier);
-        Assertions.assertTrue(supplier instanceof CachedRemoveQueryProvider);
+        Assertions.assertTrue(supplier instanceof CachedDelQueryProvider);
     }
 }