From 237cff1282edc451d7c2017dc0d273f4b3d3f965 Mon Sep 17 00:00:00 2001
From: Jan van Mansum <janvanmansum@gmail.com>
Date: Mon, 4 Nov 2024 14:28:56 +0100
Subject: [PATCH] Made --minor and assuring indexing the default in dataset
 publishing + simplified publish command line option defintions

---
 .../dvcli/command/dataset/DatasetPublish.java | 43 ++++++-------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/main/java/nl/knaw/dans/dvcli/command/dataset/DatasetPublish.java b/src/main/java/nl/knaw/dans/dvcli/command/dataset/DatasetPublish.java
index 985f23a..2b65c47 100644
--- a/src/main/java/nl/knaw/dans/dvcli/command/dataset/DatasetPublish.java
+++ b/src/main/java/nl/knaw/dans/dvcli/command/dataset/DatasetPublish.java
@@ -32,44 +32,29 @@ public class DatasetPublish extends AbstractCmd {
     @ParentCommand
     private DatasetCmd datasetCmd;
 
-    static class PublishParams {
-        @ArgGroup(exclusive = true)
-        VersionUpdateType versionUpdateType;
-
-        static class VersionUpdateType {
-            @Option(names = "--major", description = "Version update type: major (default)")
-            boolean major;
-            @Option(names = "--minor", description = "Version update type: minor")
-            boolean minor;
-        }
-
-        @Option(names = { "-a", "--assure-indexed" }, paramLabel = "assure-indexed", description = "Set to true to ensure that indexing has already happened before publish.")
-        private boolean assureIsIndexed = true;
+    @ArgGroup(exclusive = true)
+    VersionUpdateType versionUpdateType;
+
+    static class VersionUpdateType {
+        @Option(names = "--major", description = "Version update type: major")
+        boolean major;
+        @Option(names = "--minor", description = "Version update type: minor (default)")
+        boolean minor;
     }
 
-    @ArgGroup(exclusive = false)
-    PublishParams publishParams;
+    @Option(names = {"--skip-assure-indexed" }, paramLabel = "skip-assure-indexed", description = "Do not attempt to assure that the dataset is indexed.")
+    private boolean skipAssureIsIndexed;
 
     private UpdateType getUpdateType() {
-        if (publishParams != null && publishParams.versionUpdateType != null) {
-            if (publishParams.versionUpdateType.minor) {
-                return UpdateType.minor;
-            }
-        }
-        return UpdateType.major;
-    }
-
-    private boolean isAssureIndexed() {
-        if (publishParams != null)
-            return publishParams.assureIsIndexed;
-
-        return true;
+        if (versionUpdateType != null && versionUpdateType.major)
+            return UpdateType.major;
+        return UpdateType.minor;
     }
 
     @Override
     public void doCall() throws IOException, DataverseException {
         datasetCmd.batchProcessor(dataset -> dataset
-            .publish(this.getUpdateType(), this.isAssureIndexed())
+            .publish(this.getUpdateType(), skipAssureIsIndexed)
             .getEnvelopeAsString()
         ).process();
     }