Allow use of _id for "insertOne" (#1338)

Author: tatu-at-datastax

src/main/java/io/stargate/sgv2/jsonapi/service/cqldriver/executor/QueryExecutor.java

@@ -265,7 +265,8 @@ protected Uni<Optional<TableMetadata>> getSchema(
           .failure(ErrorCode.NAMESPACE_DOES_NOT_EXIST.toApiException("%s", namespace));
     }
     // else get the table
-    // TODO: this should probably use CqlIdentifier.fromCql() if we want to be case sensitive
+    // TODO: this should probably use CqlIdentifier.fromCql() (or .fromInternal())
+    // if we want to support case-sensitive names
     return Uni.createFrom().item(keyspaceMetadata.getTable("\"" + collectionName + "\""));
   }
 

src/main/java/io/stargate/sgv2/jsonapi/service/operation/filters/table/codecs/MissingJSONCodecException.java

@@ -22,8 +22,8 @@ public MissingJSONCodecException(
       TableMetadata table, ColumnMetadata column, Class<?> javaType, Object value) {
     super(
         String.format(
-            "No JSONCodec found for table %s column %s with java type %s and value %s",
-            table.getName(), column.getName(), javaType, value));
+            "No JSONCodec found for table '%s' column '%s' column type %s with java type %s and value %s",
+            table.getName(), column.getName(), column.getType(), javaType, value));
     this.table = table;
     this.column = column;
     this.javaType = javaType;

src/main/java/io/stargate/sgv2/jsonapi/service/operation/tables/InsertTableOperation.java

@@ -1,8 +1,7 @@
 package io.stargate.sgv2.jsonapi.service.operation.tables;
 
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.*;
-
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;
+import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
 import com.datastax.oss.driver.api.querybuilder.insert.InsertInto;
 import com.datastax.oss.driver.api.querybuilder.insert.RegularInsert;
 import io.smallrye.mutiny.Multi;
@@ -94,7 +93,7 @@ private SimpleStatement buildInsertStatement(
       QueryExecutor queryExecutor, TableInsertAttempt insertAttempt) {
 
     InsertInto insertInto =
-        insertInto(
+        QueryBuilder.insertInto(
             commandContext.schemaObject().tableMetadata.getKeyspace(),
             commandContext.schemaObject().tableMetadata.getName());
 

src/main/java/io/stargate/sgv2/jsonapi/service/operation/tables/TableInsertAttempt.java

@@ -3,15 +3,14 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import io.stargate.sgv2.jsonapi.service.cqldriver.executor.TableSchemaObject;
 import io.stargate.sgv2.jsonapi.service.operation.InsertAttempt;
-import io.stargate.sgv2.jsonapi.service.operation.query.InsertValuesCQLClause;
 import io.stargate.sgv2.jsonapi.service.shredding.DocRowIdentifer;
 import io.stargate.sgv2.jsonapi.service.shredding.tables.RowId;
 import io.stargate.sgv2.jsonapi.service.shredding.tables.RowShredder;
 import io.stargate.sgv2.jsonapi.service.shredding.tables.WriteableTableRow;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.stream.IntStream;
 
 public class TableInsertAttempt implements InsertAttempt {
 
@@ -41,25 +40,23 @@ public static List<TableInsertAttempt> create(
     Objects.requireNonNull(tableSchemaObject, "tableSchemaObject cannot be null");
     Objects.requireNonNull(documents, "documents cannot be null");
 
-    // TODO, just use a for loop, instead of IntStream
-    return IntStream.range(0, documents.size())
-        .mapToObj(
-            i -> {
-              WriteableTableRow row;
-              try {
-                row = shredder.shred(tableSchemaObject, documents.get(i));
-              } catch (Exception e) {
-                // TODO: need a shredding base excpetion to catch
-                // TODO: we need to get the row id, so we can return it in the response
-                return (TableInsertAttempt)
-                    new TableInsertAttempt(tableSchemaObject, i, null, null).maybeAddFailure(e);
-              }
-              return new TableInsertAttempt(tableSchemaObject, i, row.id(), row);
-            })
-        .toList();
+    final List<TableInsertAttempt> attempts = new ArrayList<>(documents.size());
+    for (int i = 0; i < documents.size(); i++) {
+      try {
+        WriteableTableRow row = shredder.shred(tableSchemaObject, documents.get(i));
+        attempts.add(new TableInsertAttempt(tableSchemaObject, i, row.id(), row));
+      } catch (Exception e) {
+        // TODO: need a shredding base exception to catch
+        // TODO: we need to get the row id, so we can return it in the response
+        attempts.add(
+            (TableInsertAttempt)
+                new TableInsertAttempt(tableSchemaObject, i, null, null).maybeAddFailure(e));
+      }
+    }
+    return attempts;
   }
 
-  public InsertValuesCQLClause getInsertValuesCQLClause() {
+  public TableInsertValuesCQLClause getInsertValuesCQLClause() {
     return new TableInsertValuesCQLClause(tableSchemaObject, row);
   }
 

src/main/java/io/stargate/sgv2/jsonapi/service/resolver/matcher/FilterMatchRules.java

@@ -53,7 +53,7 @@ public FilterMatchRule<T> addMatchRule(
   }
 
   /**
-   * Applies all the rules to to return an Operation or throw.
+   * Applies all the rules to return an Operation or throw.
    *
    * @param commandContext
    * @param command

src/main/java/io/stargate/sgv2/jsonapi/service/resolver/update/TableUpdateResolver.java

@@ -105,7 +105,7 @@ private static List<ColumnAssignment> resolveSet(TableSchemaObject table, Object
             entry ->
                 new ColumnAssignment(
                     table.tableMetadata,
-                    CqlIdentifier.fromCql(entry.getKey()),
+                    CqlIdentifier.fromInternal(entry.getKey()),
                     RowShredder.shredValue(entry.getValue())))
         .toList();
   }
@@ -132,7 +132,7 @@ private static List<ColumnAssignment> resolveUnset(
         .map(
             entry ->
                 new ColumnAssignment(
-                    table.tableMetadata, CqlIdentifier.fromCql(entry.getKey()), null))
+                    table.tableMetadata, CqlIdentifier.fromInternal(entry.getKey()), null))
         .toList();
   }
 }

src/main/java/io/stargate/sgv2/jsonapi/service/shredding/tables/RowShredder.java

@@ -47,8 +47,9 @@ public WriteableTableRow shred(TableSchemaObject table, JsonNode document) {
         .fields()
         .forEachRemaining(
             entry -> {
-              // using fromCQL so it is case sensitive
-              columnValues.put(CqlIdentifier.fromCql(entry.getKey()), shredValue(entry.getValue()));
+              // using fromInternal to preserve case-sensitivity
+              columnValues.put(
+                  CqlIdentifier.fromInternal(entry.getKey()), shredValue(entry.getValue()));
             });
 
     // the document should have been validated that all the fields present exist in the table
@@ -58,8 +59,9 @@ public WriteableTableRow shred(TableSchemaObject table, JsonNode document) {
             .map(ColumnMetadata::getName)
             .map(
                 colIdentifier -> {
-                  if (columnValues.containsKey(colIdentifier)) {
-                    return columnValues.get(colIdentifier);
+                  Object value = columnValues.get(colIdentifier);
+                  if (value != null) {
+                    return value;
                   }
                   throw new UnvalidatedClauseException(
                       String.format(