Minor clean up on #1698 fix based on code review comments (#1805)

stargate · Jan 2, 2025 · 7c3d330 · 7c3d330
1 parent 0269372
commit 7c3d330
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/main/java/io/stargate/sgv2/jsonapi/service/operation/tables/TableInsertAttempt.java b/src/main/java/io/stargate/sgv2/jsonapi/service/operation/tables/TableInsertAttempt.java
@@ -3,7 +3,6 @@
 import io.stargate.sgv2.jsonapi.api.model.command.table.definition.ColumnsDescContainer;
 import io.stargate.sgv2.jsonapi.service.cqldriver.executor.TableSchemaObject;
 import io.stargate.sgv2.jsonapi.service.operation.InsertAttempt;
-import io.stargate.sgv2.jsonapi.service.schema.tables.ApiSupportDef;
 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.WriteableTableRow;
@@ -45,7 +44,7 @@ public Optional<ColumnsDescContainer> schemaDescription() {
       return Optional.empty();
     }
     var apiColumns = schemaObject.apiTableDef().primaryKeys();
-    var unsupported = apiColumns.filterBySupport(ApiSupportDef::isUnsupportedInsert);
+    var unsupported = apiColumns.filterBySupport(x -> !x.insert());
     if (!unsupported.isEmpty()) {
       throw new IllegalStateException("Unsupported columns primary key: %s" + unsupported);
     }

diff --git a/src/main/java/io/stargate/sgv2/jsonapi/service/schema/tables/ApiSupportDef.java b/src/main/java/io/stargate/sgv2/jsonapi/service/schema/tables/ApiSupportDef.java
@@ -57,10 +57,6 @@ default boolean isUnsupportedDML() {
     return !insert() || !read() || !filter();
   }
 
-  default boolean isUnsupportedInsert() {
-    return !insert();
-  }
-
   /**
    * Helper record to be used when the support can be determined at compile time, or easily cached.
    */