DD-1605 Implement several dd-dataverse-cli dataset commands

pom.xml

@@ -80,6 +80,7 @@
         <dependency>
             <groupId>nl.knaw.dans</groupId>
             <artifactId>dans-dataverse-client-lib</artifactId>
+            <version>0.33.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

src/main/java/nl/knaw/dans/dvcli/DdDataverseCli.java

@@ -18,7 +18,6 @@
 
 import lombok.extern.slf4j.Slf4j;
 import nl.knaw.dans.dvcli.action.Database;
-import nl.knaw.dans.dvcli.command.CollectionAssignRole;
 import nl.knaw.dans.dvcli.command.CollectionCmd;
 import nl.knaw.dans.dvcli.command.CollectionCreateDataset;
 import nl.knaw.dans.dvcli.command.CollectionDelete;
@@ -27,14 +26,19 @@
 import nl.knaw.dans.dvcli.command.CollectionImportDataset;
 import nl.knaw.dans.dvcli.command.CollectionIsMetadataBlocksRoot;
 import nl.knaw.dans.dvcli.command.CollectionListMetadataBlocks;
-import nl.knaw.dans.dvcli.command.CollectionListRoleAssignments;
 import nl.knaw.dans.dvcli.command.CollectionListRoles;
 import nl.knaw.dans.dvcli.command.CollectionPublish;
+import nl.knaw.dans.dvcli.command.CollectionRoleAssignment;
 import nl.knaw.dans.dvcli.command.CollectionSetMetadataBlocksRoot;
 import nl.knaw.dans.dvcli.command.CollectionView;
 import nl.knaw.dans.dvcli.command.DatasetCmd;
+import nl.knaw.dans.dvcli.command.DatasetDeleteDraft;
+import nl.knaw.dans.dvcli.command.DatasetGetFiles;
+import nl.knaw.dans.dvcli.command.DatasetGetLatestVersion;
+import nl.knaw.dans.dvcli.command.DatasetGetVersion;
+import nl.knaw.dans.dvcli.command.DatasetPublish;
+import nl.knaw.dans.dvcli.command.DatasetRoleAssignment;
 import nl.knaw.dans.dvcli.command.DatasetValidateFiles;
-import nl.knaw.dans.dvcli.command.DeleteDraft;
 import nl.knaw.dans.dvcli.command.NotificationTruncate;
 import nl.knaw.dans.dvcli.config.DdDataverseCliConfig;
 import nl.knaw.dans.lib.dataverse.DataverseClient;
@@ -63,24 +67,28 @@
         var dataverseClient = config.getApi().build();
         var databaseConfig = config.getDb();
         var database = new Database(databaseConfig);
-        
+
         commandLine.addSubcommand(new CommandLine(new CollectionCmd(dataverseClient))
-                .addSubcommand(new CollectionAssignRole())
                 .addSubcommand(new CollectionCreateDataset())
                 .addSubcommand(new CollectionDelete())
                 .addSubcommand(new CollectionGetContents())
                 .addSubcommand(new CollectionGetStorageSize())
                 .addSubcommand(new CollectionImportDataset())
                 .addSubcommand(new CollectionIsMetadataBlocksRoot())
                 .addSubcommand(new CollectionListMetadataBlocks())
-                .addSubcommand(new CollectionListRoleAssignments())
                 .addSubcommand(new CollectionListRoles())
                 .addSubcommand(new CollectionPublish())
+                .addSubcommand(new CollectionRoleAssignment())
                 .addSubcommand(new CollectionSetMetadataBlocksRoot())
                 .addSubcommand(new CollectionView()))
             .addSubcommand(new CommandLine(new DatasetCmd(dataverseClient))
+                .addSubcommand(new DatasetDeleteDraft())
+                .addSubcommand(new DatasetGetFiles())
+                .addSubcommand(new DatasetGetLatestVersion())
+                .addSubcommand(new DatasetGetVersion())
+                .addSubcommand(new DatasetPublish())
+                .addSubcommand(new DatasetRoleAssignment())
                 .addSubcommand(new DatasetValidateFiles())
-                .addSubcommand(new DeleteDraft())
             )
             .addSubcommand(new CommandLine(new NotificationTruncate(database)));
         log.debug("Configuring command line");

src/main/java/nl/knaw/dans/dvcli/command/AbstractAssignmentRole.java

@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2024 DANS - Data Archiving and Networked Services ([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package nl.knaw.dans.dvcli.command;
+
+import nl.knaw.dans.dvcli.action.Pair;
+import nl.knaw.dans.lib.dataverse.model.RoleAssignment;
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import picocli.CommandLine.ArgGroup;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+@Command
+public abstract class AbstractAssignmentRole<CMD extends AbstractSubcommandContainer<?>, API> extends AbstractCmd {
+
+    static class CommandParameter {
+        @Parameters(description = "Alias and role assignee (example: @dataverseAdmin=contributor)")
+        String assignment = "";
+
+        @Option(names = { "-f",
+            "--parameter-file" }, description = "CSV file to read parameters from. The file should have a header row with columns 'PID', 'ASSIGNEE' and 'ROLE'.")
+        Path parameterFile;
+    }
+
+    @ArgGroup(multiplicity = "1")
+    CommandParameter commandParameter;
+
+    private Optional<RoleAssignment> readFromCommandLine() {
+        if (!this.commandParameter.assignment.isEmpty() && this.commandParameter.assignment.contains("=")) {
+            String[] assigneeRole = this.commandParameter.assignment.split("=");
+
+            RoleAssignment roleAssignment = new RoleAssignment();
+            roleAssignment.setAssignee(assigneeRole[0]);
+            roleAssignment.setRole(assigneeRole[1]);
+            return Optional.of(roleAssignment);
+        }
+        return Optional.empty();
+    }
+
+    private List<Pair<String, RoleAssignmentParams<API>>> readFromFile(CMD cmd) throws IOException {
+        try (BufferedReader reader = Files.newBufferedReader(commandParameter.parameterFile);
+            CSVParser csvParser = new CSVParser(reader, CSVFormat.Builder.create(CSVFormat.DEFAULT)
+                .setHeader("PID", "ASSIGNEE", "ROLE")
+                .setSkipHeaderRecord(true)
+                .build())) {
+
+            List<Pair<String, RoleAssignmentParams<API>>> result = new ArrayList<>();
+
+            for (CSVRecord csvRecord : csvParser) {
+                var pid = csvRecord.get("PID");
+                API api = getItem(pid);
+                RoleAssignment roleAssignment = new RoleAssignment();
+                roleAssignment.setAssignee(csvRecord.get("ASSIGNEE"));
+                roleAssignment.setRole(csvRecord.get("ROLE"));
+
+                RoleAssignmentParams<API> params = new RoleAssignmentParams<>(api, Optional.of(roleAssignment));
+                result.add(new Pair<>(pid, params));
+            }
+
+            return result;
+        }
+    }
+
+    protected abstract API getItem(String pid);
+
+    protected List<Pair<String, RoleAssignmentParams<API>>> getRoleAssignmentParams(CMD cmd) throws IOException {
+        if (commandParameter.parameterFile != null) {
+            return readFromFile(cmd);
+        }
+        else if (commandParameter.assignment != null) {
+            var items = cmd.getItems();
+            return items.stream()
+                .map(p -> {
+                    var second = new RoleAssignmentParams<API>((API) p.getSecond(), readFromCommandLine());
+                    return new Pair<>(p.getFirst(), second);
+                })
+                .toList();
+        }
+        return List.of();
+    }
+
+    protected record RoleAssignmentParams<A>(A pid, Optional<RoleAssignment> roleAssignment) {
+    }
+}

src/main/java/nl/knaw/dans/dvcli/command/CollectionCmd.java

@@ -29,12 +29,13 @@
          mixinStandardHelpOptions = true,
          description = "Manage Dataverse collections (i.e. 'dataverses')")
 public class CollectionCmd extends AbstractSubcommandContainer<DataverseApi> {
+    public CollectionCmd(@NonNull DataverseClient dataverseClient) {
+        super(dataverseClient);
+    }
+
     @Override
     protected List<Pair<String, DataverseApi>> getItems() throws IOException {
         return new SingleCollectionOrCollectionsFile(targets, dataverseClient).getCollections().toList();
     }
 
-    public CollectionCmd(@NonNull DataverseClient dataverseClient) {
-        super(dataverseClient);
-    }
 }

src/main/java/nl/knaw/dans/dvcli/command/CollectionCreateDataset.java

@@ -15,7 +15,6 @@
  */
 package nl.knaw.dans.dvcli.command;
 
-import nl.knaw.dans.dvcli.action.ConsoleReport;
 import nl.knaw.dans.lib.dataverse.DataverseException;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
@@ -43,14 +42,7 @@ public class CollectionCreateDataset extends AbstractCmd {
 
     @Override
     public void doCall() throws IOException, DataverseException {
-        collectionCmd.batchProcessorBuilder()
-            .action(d -> {
-                var json = Files.readString(Path.of(dataset));
-                var r = d.createDataset(json, metadataKeys);
-                return r.getEnvelopeAsString();
-            })
-            .report(new ConsoleReport<>())
-            .build()
-            .process();
+        collectionCmd.batchProcessor(c ->
+            c.createDataset(Files.readString(Path.of(dataset)), metadataKeys).getEnvelopeAsString()).process();
     }
 }

src/main/java/nl/knaw/dans/dvcli/command/CollectionDelete.java

@@ -15,7 +15,6 @@
  */
 package nl.knaw.dans.dvcli.command;
 
-import nl.knaw.dans.dvcli.action.ConsoleReport;
 import nl.knaw.dans.lib.dataverse.DataverseException;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.ParentCommand;
@@ -31,13 +30,6 @@
 
     @Override
     public void doCall() throws IOException, DataverseException {
-        collectionCmd.batchProcessorBuilder()
-            .action(d -> {
-                var r = d.delete();
-                return r.getEnvelopeAsString();
-            })
-            .report(new ConsoleReport<>())
-            .build()
-            .process();
+        collectionCmd.batchProcessor(c -> c.delete().getEnvelopeAsString()).process();
     }
 }

src/main/java/nl/knaw/dans/dvcli/command/CollectionGetContents.java

@@ -15,7 +15,6 @@
  */
 package nl.knaw.dans.dvcli.command;
 
-import nl.knaw.dans.dvcli.action.ConsoleReport;
 import nl.knaw.dans.lib.dataverse.DataverseException;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.ParentCommand;
@@ -31,13 +30,6 @@
 
     @Override
     public void doCall() throws IOException, DataverseException {
-        collectionCmd.batchProcessorBuilder()
-            .action(d -> {
-                var r = d.getContents();
-                return r.getEnvelopeAsString();
-            })
-            .report(new ConsoleReport<>())
-            .build()
-            .process();
+        collectionCmd.batchProcessor(c -> c.getContents().getEnvelopeAsString()).process();
     }
 }