Support empty options for DDL commands

src/main/java/io/stargate/sgv2/jsonapi/api/model/command/impl/AlterTableCommand.java

@@ -2,11 +2,13 @@
 
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import io.stargate.sgv2.jsonapi.api.model.command.CollectionCommand;
+import io.stargate.sgv2.jsonapi.api.model.command.NoOptionsCommand;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
 @Schema(description = "Command that alters the column definition in a table.")
 @JsonTypeName("alterTable")
-public record AlterTableCommand(AlterTableOperation operation) implements CollectionCommand {
+public record AlterTableCommand(AlterTableOperation operation)
+    implements CollectionCommand, NoOptionsCommand {
 
   @Override
   public CommandName commandName() {

src/main/java/io/stargate/sgv2/jsonapi/api/model/command/impl/CreateIndexCommand.java

@@ -61,7 +61,8 @@ public record Options(
 
   // This is index command option irrespective of column definition.
   public record Options(
-      @Schema(
+      @Nullable
+          @Schema(
               description = "Flag to ignore if index already exists",
               defaultValue = "false",
               type = SchemaType.BOOLEAN,

src/main/java/io/stargate/sgv2/jsonapi/api/model/command/impl/CreateTableCommand.java

@@ -4,11 +4,11 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import io.stargate.sgv2.jsonapi.api.model.command.TableOnlyCommand;
 import io.stargate.sgv2.jsonapi.api.model.command.table.definition.TableDefinitionDesc;
+import jakarta.annotation.Nullable;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
-import javax.annotation.Nullable;
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
@@ -34,7 +34,8 @@ public record CreateTableCommand(
     implements TableOnlyCommand {
 
   public record Options(
-      @Schema(
+      @Nullable
+          @Schema(
               description = "Flag to ignore if table already exists",
               defaultValue = "false",
               type = SchemaType.BOOLEAN,

src/main/java/io/stargate/sgv2/jsonapi/api/model/command/impl/CreateVectorIndexCommand.java

@@ -56,7 +56,8 @@ public record Options(
 
   // This is index command option irrespective of column definition.
   public record Options(
-      @Schema(
+      @Nullable
+          @Schema(
               description = "Flag to ignore if index already exists",
               defaultValue = "false",
               type = SchemaType.BOOLEAN,

src/main/java/io/stargate/sgv2/jsonapi/api/model/command/impl/DropIndexCommand.java

@@ -23,7 +23,8 @@ public record DropIndexCommand(
     implements NoOptionsCommand, KeyspaceCommand {
 
   public record Options(
-      @Schema(
+      @Nullable
+          @Schema(
               description = "Flag to ignore if index doesn't exists",
               defaultValue = "false",
               type = SchemaType.BOOLEAN,

src/main/java/io/stargate/sgv2/jsonapi/api/model/command/impl/DropTableCommand.java

@@ -22,7 +22,8 @@ public record DropTableCommand(
     implements NoOptionsCommand, KeyspaceCommand {
 
   public record Options(
-      @Schema(
+      @Nullable
+          @Schema(
               description = "Flag to ignore if table doesn't exists",
               defaultValue = "false",
               type = SchemaType.BOOLEAN,

src/main/java/io/stargate/sgv2/jsonapi/service/resolver/CreateIndexCommandResolver.java

@@ -31,7 +31,6 @@ public class CreateIndexCommandResolver implements CommandResolver<CreateIndexCo
   public Class<CreateIndexCommand> getCommandClass() {
     return CreateIndexCommand.class;
   }
-  ;
 
   @Override
   public Operation resolveTableCommand(
@@ -77,11 +76,11 @@ public Operation resolveTableCommand(
     }
 
     // Command level option for ifNotExists
-    boolean ifNotExists = false;
-    final CreateIndexCommand.Options commandOptions = command.options();
-    if (commandOptions != null && commandOptions.ifNotExists() != null) {
-      ifNotExists = commandOptions.ifNotExists();
-    }
+    boolean ifNotExists =
+        Optional.ofNullable(command.options())
+            .map(CreateIndexCommand.Options::ifNotExists)
+            .orElse(false);
+
     final SchemaAttempt.SchemaRetryPolicy schemaRetryPolicy =
         new SchemaAttempt.SchemaRetryPolicy(
             ctx.getConfig(OperationsConfig.class).databaseConfig().ddlRetries(),

src/main/java/io/stargate/sgv2/jsonapi/service/resolver/CreateTableCommandResolver.java

@@ -14,6 +14,7 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import java.util.List;
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,7 +31,10 @@ public Operation resolveKeyspaceCommand(
       CommandContext<KeyspaceSchemaObject> ctx, CreateTableCommand command) {
 
     String tableName = command.name();
-    boolean ifNotExists = command.options() != null ? command.options().ifNotExists() : false;
+    boolean ifNotExists =
+        Optional.ofNullable(command.options())
+            .map(CreateTableCommand.Options::ifNotExists)
+            .orElse(false);
 
     // TODO: AARON: this is where the bad user column types like list of map will be caught and
     // thrown

src/main/java/io/stargate/sgv2/jsonapi/service/resolver/CreateVectorIndexCommandResolver.java

@@ -70,11 +70,10 @@ public Operation resolveTableCommand(
     }
 
     // Command level option for ifNotExists
-    boolean ifNotExists = false;
-    final CreateVectorIndexCommand.Options commandOptions = command.options();
-    if (commandOptions != null && commandOptions.ifNotExists() != null) {
-      ifNotExists = commandOptions.ifNotExists();
-    }
+    boolean ifNotExists =
+        Optional.ofNullable(command.options())
+            .map(CreateVectorIndexCommand.Options::ifNotExists)
+            .orElse(false);
 
     // Default Similarity Function to COSINE
     if (similarityFunction == null && sourceModel == null) {

src/main/java/io/stargate/sgv2/jsonapi/service/resolver/DropIndexCommandResolver.java

@@ -17,6 +17,7 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import java.time.Duration;
 import java.util.List;
+import java.util.Optional;
 
 /** Resolver for the {@link DropIndexCommand}. */
 @ApplicationScoped
@@ -34,8 +35,10 @@ public Operation resolveKeyspaceCommand(
             ctx.getConfig(OperationsConfig.class).databaseConfig().ddlRetries(),
             Duration.ofMillis(
                 ctx.getConfig(OperationsConfig.class).databaseConfig().ddlRetryDelayMillis()));
-    final DropIndexCommand.Options options = command.options();
-    final boolean ifExists = (options != null) && options.ifExists();
+    final boolean ifExists =
+        Optional.ofNullable(command.options())
+            .map(DropIndexCommand.Options::ifExists)
+            .orElse(false);
     CQLOption<Drop> cqlOption = null;
     if (ifExists) {
       cqlOption = CQLOption.ForDrop.ifExists();

src/main/java/io/stargate/sgv2/jsonapi/service/resolver/DropTableCommandResolver.java

@@ -1,5 +1,6 @@
 package io.stargate.sgv2.jsonapi.service.resolver;
 
+import com.datastax.oss.driver.api.querybuilder.schema.Drop;
 import io.stargate.sgv2.jsonapi.api.model.command.CommandContext;
 import io.stargate.sgv2.jsonapi.api.model.command.impl.DropTableCommand;
 import io.stargate.sgv2.jsonapi.config.DebugModeConfig;
@@ -16,6 +17,7 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import java.time.Duration;
 import java.util.List;
+import java.util.Optional;
 
 /** Resolver for the {@link DropTableCommand}. */
 @ApplicationScoped
@@ -28,14 +30,16 @@ public Class<DropTableCommand> getCommandClass() {
   @Override
   public Operation resolveKeyspaceCommand(
       CommandContext<KeyspaceSchemaObject> ctx, DropTableCommand command) {
-    final DropTableCommand.Options options = command.options();
-    final boolean ifExists = (options != null) && options.ifExists();
+    final boolean ifExists =
+        Optional.ofNullable(command.options())
+            .map(DropTableCommand.Options::ifExists)
+            .orElse(false);
     final SchemaAttempt.SchemaRetryPolicy schemaRetryPolicy =
         new SchemaAttempt.SchemaRetryPolicy(
             ctx.getConfig(OperationsConfig.class).databaseConfig().ddlRetries(),
             Duration.ofMillis(
                 ctx.getConfig(OperationsConfig.class).databaseConfig().ddlRetryDelayMillis()));
-    CQLOption cqlOption = null;
+    CQLOption<Drop> cqlOption = null;
     if (ifExists) {
       cqlOption = CQLOption.ForDrop.ifExists();
     }