improves delete

Author: otaviojava

cassandra-driver/src/main/java/org/eclipse/jnosql/diana/cassandra/column/DefaultCassandraColumnFamilyManager.java

@@ -24,6 +24,7 @@
 import com.datastax.oss.driver.api.core.type.codec.TypeCodec;
 import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry;
 import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
+import com.datastax.oss.driver.api.querybuilder.delete.Delete;
 import com.datastax.oss.driver.api.querybuilder.insert.Insert;
 import jakarta.nosql.column.ColumnDeleteQuery;
 import jakarta.nosql.column.ColumnEntity;
@@ -165,27 +166,34 @@ public void close() {
     }
 
     @Override
-    public void delete(ColumnDeleteQuery query, ConsistencyLevel level) throws NullPointerException {
-
+    public void delete(ColumnDeleteQuery query, ConsistencyLevel level) {
+        requireNonNull(query, "query is required");
+        requireNonNull(level, "level is required");
+        final Delete delete = DeleteQueryConverter.delete(query, keyspace);
+        final SimpleStatement build = delete.build();
+        final SimpleStatement simpleStatement = build.setConsistencyLevel(level);
+        session.execute(simpleStatement);
     }
 
     @Override
-    public void delete(ColumnDeleteQuery columnDeleteQuery) {
-
+    public void delete(ColumnDeleteQuery query) {
+        requireNonNull(query, "query is required");
+        final Delete delete = DeleteQueryConverter.delete(query, keyspace);
+        session.execute(delete.build());
     }
 
 
     @Override
     public Stream<ColumnEntity> cql(String query) {
-        Objects.requireNonNull(query, "query is required");
+        requireNonNull(query, "query is required");
         final ResultSet resultSet = session.execute(query);
         return resultSet.all().stream().map(CassandraConverter::toDocumentEntity);
     }
 
     @Override
     public Stream<ColumnEntity> cql(String query, Map<String, Object> values) {
-        Objects.requireNonNull(query, "query is required");
-        Objects.requireNonNull(values, "values is required");
+        requireNonNull(query, "query is required");
+        requireNonNull(values, "values is required");
         final PreparedStatement prepare = session.prepare(query);
         BoundStatement statement = prepare.bind();
         for (Map.Entry<String, Object> entry : values.entrySet()) {
@@ -198,14 +206,14 @@ public Stream<ColumnEntity> cql(String query, Map<String, Object> values) {
 
     @Override
     public Stream<ColumnEntity> execute(SimpleStatement statement) {
-        Objects.requireNonNull(statement, "statement is required");
+        requireNonNull(statement, "statement is required");
         final ResultSet resultSet = session.execute(statement);
         return resultSet.all().stream().map(CassandraConverter::toDocumentEntity);
     }
 
     @Override
     public CassandraPreparedStatement nativeQueryPrepare(String query) {
-        Objects.requireNonNull(query, "query is required");
+        requireNonNull(query, "query is required");
         final PreparedStatement prepare = session.prepare(query);
         return new CassandraPreparedStatement(prepare, session);
     }

cassandra-driver/src/main/java/org/eclipse/jnosql/diana/cassandra/column/DeleteQueryConverter.java

@@ -0,0 +1,38 @@
+/*
+ *  Copyright (c) 2020 Otávio Santana and others
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
+ *   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+ *
+ *   You may elect to redistribute this code under either of these licenses.
+ *
+ *   Contributors:
+ *
+ *   Otavio Santana
+ */
+
+package org.eclipse.jnosql.diana.cassandra.column;
+
+import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
+import com.datastax.oss.driver.api.querybuilder.delete.Delete;
+import com.datastax.oss.driver.api.querybuilder.delete.DeleteSelection;
+import jakarta.nosql.column.ColumnDeleteQuery;
+
+final class DeleteQueryConverter {
+    private DeleteQueryConverter() {
+    }
+
+    static Delete delete(ColumnDeleteQuery query, String keyspace) {
+        final String columnFamily = query.getColumnFamily();
+        DeleteSelection deleteSelection = QueryBuilder.deleteFrom(keyspace, columnFamily);
+
+        for (String column : query.getColumns()) {
+            deleteSelection = deleteSelection.column(QueryUtils.getName(column));
+        }
+
+        final Delete delete = deleteSelection.where(Relations.createClause(query.getCondition().orElse(null)));
+        return delete;
+    }
+}

cassandra-driver/src/main/java/org/eclipse/jnosql/diana/cassandra/column/QueryUtils.java

@@ -159,8 +159,10 @@ public static String count(String columnFamily, String keyspace) {
     }
 
     static String getName(Column column) {
+        return getName(column.getName());
+    }
 
-        String name = column.getName();
+    static String getName(String name) {
         if (name.charAt(0) == '_') {
             return "\"" + name + "\"";
         }