changed delete operation to use the new 3DCityDB terminate function

Author: clausnagel

citydb-cli/src/main/java/org/citydb/cli/deleter/DeleteCommand.java

@@ -63,6 +63,10 @@ enum Mode {delete, terminate}
             description = "Delete mode: ${COMPLETION-CANDIDATES} (default: ${DEFAULT-VALUE}).")
     private Mode mode;
 
+    @CommandLine.Option(names = "--no-terminate-all", negatable = true, defaultValue = "true",
+            description = "Also terminate sub-features (default: ${DEFAULT-VALUE}).")
+    private boolean terminateAll;
+
     @CommandLine.Mixin
     protected IndexOptions indexOptions;
 
@@ -220,12 +224,21 @@ private DeleteOptions getDeleteOptions() throws ExecutionException {
             if (Command.hasMatchedOption("--delete-mode", commandSpec)) {
                 deleteOptions.setMode(mode == Mode.terminate ? DeleteMode.TERMINATE : DeleteMode.DELETE);
             }
+
+            if (Command.hasMatchedOption("--no-terminate-all", commandSpec)) {
+                deleteOptions.setTerminateWithSubFeatures(terminateAll);
+            }
         } else {
             deleteOptions = new DeleteOptions();
-            deleteOptions.setMode(mode == Mode.terminate ? DeleteMode.TERMINATE : DeleteMode.DELETE);
+            deleteOptions.setMode(mode == Mode.terminate ? DeleteMode.TERMINATE : DeleteMode.DELETE)
+                    .setTerminateWithSubFeatures(terminateAll);
         }
 
         if (metadataOptions != null) {
+            if (metadataOptions.getTerminationDate() != null) {
+                deleteOptions.setTerminationDate(metadataOptions.getTerminationDate());
+            }
+
             if (metadataOptions.getLineage() != null) {
                 deleteOptions.setLineage(metadataOptions.getLineage());
             }

citydb-cli/src/main/java/org/citydb/cli/deleter/options/MetadataOptions.java

@@ -22,9 +22,17 @@
 package org.citydb.cli.deleter.options;
 
 import org.citydb.cli.common.Option;
+import org.citydb.core.time.TimeHelper;
 import picocli.CommandLine;
 
+import java.time.OffsetDateTime;
+
 public class MetadataOptions implements Option {
+    @CommandLine.Option(names = "--termination-date",
+            description = "Time in <YYYY-MM-DD> or <YYYY-MM-DDThh:mm:ss[(+|-)hh:mm]> format to use as " +
+                    "termination date (default: now)")
+    private String time;
+
     @CommandLine.Option(names = "--lineage",
             description = "Lineage to use for the features.")
     private String lineage;
@@ -37,6 +45,12 @@ public class MetadataOptions implements Option {
             description = "Reason for deleting the data.")
     private String reasonForUpdate;
 
+    private OffsetDateTime terminationDate;
+
+    public OffsetDateTime getTerminationDate() {
+        return terminationDate;
+    }
+
     public String getLineage() {
         return lineage;
     }
@@ -48,4 +62,17 @@ public String getUpdatingPerson() {
     public String getReasonForUpdate() {
         return reasonForUpdate;
     }
+
+    @Override
+    public void preprocess(CommandLine commandLine) throws Exception {
+        if (time != null) {
+            try {
+                terminationDate = OffsetDateTime.parse(time, TimeHelper.DATE_TIME_FORMATTER);
+            } catch (Exception e) {
+                throw new CommandLine.ParameterException(commandLine,
+                        "The termination time must be in YYYY-MM-DD or YYYY-MM-DDThh:mm:ss[(+|-)hh:mm] " +
+                                "format but was '" + time + "'");
+            }
+        }
+    }
 }

citydb-operation/src/main/java/org/citydb/operation/deleter/DeleteOptions.java

@@ -37,10 +37,11 @@ public class DeleteOptions {
     private DeleteMode mode = DeleteMode.DELETE;
     private int numberOfThreads;
     private int batchSize = DEFAULT_BATCH_SIZE;
+    private boolean terminateWithSubFeatures = true;
+    private OffsetDateTime terminationDate;
     private String updatingPerson;
     private String reasonForUpdate;
     private String lineage;
-    private OffsetDateTime terminationDate;
 
     public DeleteMode getMode() {
         return mode != null ? mode : DeleteMode.DELETE;
@@ -69,6 +70,24 @@ public DeleteOptions setBatchSize(int batchSize) {
         return this;
     }
 
+    public boolean isTerminateWithSubFeatures() {
+        return terminateWithSubFeatures;
+    }
+
+    public DeleteOptions setTerminateWithSubFeatures(boolean terminateWithSubFeatures) {
+        this.terminateWithSubFeatures = terminateWithSubFeatures;
+        return this;
+    }
+
+    public Optional<OffsetDateTime> getTerminationDate() {
+        return Optional.ofNullable(terminationDate);
+    }
+
+    public DeleteOptions setTerminationDate(OffsetDateTime terminationDate) {
+        this.terminationDate = terminationDate;
+        return this;
+    }
+
     public Optional<String> getUpdatingPerson() {
         return Optional.ofNullable(updatingPerson);
     }
@@ -95,13 +114,4 @@ public DeleteOptions setLineage(String lineage) {
         this.lineage = lineage;
         return this;
     }
-
-    public Optional<OffsetDateTime> getTerminationDate() {
-        return Optional.ofNullable(terminationDate);
-    }
-
-    public DeleteOptions setTerminationDate(OffsetDateTime terminationDate) {
-        this.terminationDate = terminationDate;
-        return this;
-    }
 }

citydb-operation/src/main/java/org/citydb/operation/deleter/feature/FeatureDeleter.java

@@ -21,7 +21,7 @@
 
 package org.citydb.operation.deleter.feature;
 
-import org.citydb.database.schema.Table;
+import com.alibaba.fastjson2.JSONObject;
 import org.citydb.operation.deleter.DeleteException;
 import org.citydb.operation.deleter.DeleteHelper;
 import org.citydb.operation.deleter.common.DatabaseDeleter;
@@ -30,32 +30,27 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.sql.Types;
 import java.time.OffsetDateTime;
 
 public class FeatureDeleter extends DatabaseDeleter {
+    private final JSONObject metadata = new JSONObject();
 
     public FeatureDeleter(DeleteHelper helper) throws SQLException {
         super(helper);
+        helper.getOptions().getReasonForUpdate().ifPresent(reasonForUpdate ->
+                metadata.put("reason_for_update", reasonForUpdate));
+        helper.getOptions().getLineage().ifPresent(lineage ->
+                metadata.put("lineage", lineage));
+        metadata.put("updating_person", helper.getOptions().getUpdatingPerson()
+                .orElseGet(helper.getAdapter().getConnectionDetails()::getUser));
     }
 
     @Override
     protected PreparedStatement getDeleteStatement(Connection connection) throws SQLException {
-        if (helper.getOptions().getMode() == DeleteMode.TERMINATE) {
-            StringBuilder stmt = new StringBuilder("update ")
-                    .append(helper.getTableHelper().getPrefixedTableName(Table.FEATURE))
-                    .append(" set termination_date = ?, last_modification_date = ?, updating_person = ?");
-
-            helper.getOptions().getReasonForUpdate().ifPresent(reasonForUpdate ->
-                    stmt.append(", reason_for_update = '").append(reasonForUpdate).append("'"));
-
-            helper.getOptions().getLineage().ifPresent(lineage ->
-                    stmt.append(", lineage = '").append(lineage).append("'"));
-
-            stmt.append(" where id = ?");
-            return connection.prepareStatement(stmt.toString());
-        } else {
-            return connection.prepareCall("{call citydb_pkg.delete_feature(?, ?)}");
-        }
+        return helper.getOptions().getMode() == DeleteMode.TERMINATE ?
+                connection.prepareCall("{call citydb_pkg.terminate_feature(?, ?, ?, ?)}") :
+                connection.prepareCall("{call citydb_pkg.delete_feature(?, ?)}");
     }
 
     public void deleteFeature(long id) throws DeleteException, SQLException {
@@ -65,19 +60,14 @@ public void deleteFeature(long id) throws DeleteException, SQLException {
     @Override
     protected void executeBatch(Long[] ids) throws SQLException {
         if (helper.getOptions().getMode() == DeleteMode.TERMINATE) {
-            String updatingPerson = helper.getOptions().getUpdatingPerson()
-                    .orElse(helper.getAdapter().getConnectionDetails().getUser());
-
-            for (long id : ids) {
-                OffsetDateTime now = OffsetDateTime.now().withNano(0);
-                stmt.setObject(1, helper.getOptions().getTerminationDate().orElse(now));
-                stmt.setObject(2, now);
-                stmt.setString(3, updatingPerson);
-                stmt.setLong(4, id);
-                stmt.addBatch();
-            }
+            metadata.put("termination_date", helper.getOptions().getTerminationDate()
+                    .orElseGet(() -> OffsetDateTime.now().withNano(0)));
 
-            stmt.executeBatch();
+            stmt.setArray(1, helper.getConnection().createArrayOf("bigint", ids));
+            stmt.setString(2, helper.getAdapter().getConnectionDetails().getSchema());
+            stmt.setObject(3, metadata.toString(), Types.OTHER);
+            stmt.setBoolean(4, helper.getOptions().isTerminateWithSubFeatures());
+            stmt.execute();
         } else {
             stmt.setArray(1, helper.getConnection().createArrayOf("bigint", ids));
             stmt.setString(2, helper.getAdapter().getConnectionDetails().getSchema());