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

…subcommand remove for RoleAssignmnet command (collection and dataset)

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/command/AbstractAssignmentRole.java

@@ -35,15 +35,13 @@
 
 @Command
 public abstract class AbstractAssignmentRole<CMD extends AbstractSubcommandContainer<?>, API> extends AbstractCmd {
-/*    @ParentCommand
-    protected DatasetCmd datasetCmd;*/
 
     static class CommandParameter {
-        @Parameters(description = "alias and role assignee (example: @dataverseAdmin=contributor)")
+        @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', 'ROLE', and 'ASSIGNMENT'.")
+            "--parameter-file" }, description = "CSV file to read parameters from. The file should have a header row with columns 'PID', 'ASSIGNEE' and 'ROLE'.")
         Path parameterFile;
     }
 

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

@@ -20,20 +20,25 @@
 import nl.knaw.dans.dvcli.action.ThrowingFunction;
 import nl.knaw.dans.lib.dataverse.DataverseApi;
 import nl.knaw.dans.lib.dataverse.DataverseException;
+import nl.knaw.dans.lib.dataverse.model.RoleAssignment;
+import nl.knaw.dans.lib.dataverse.model.RoleAssignmentReadOnly;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.ParentCommand;
 
 import java.io.IOException;
+import java.util.Optional;
 
 @Command(name = "role-assignment",
          mixinStandardHelpOptions = true,
          description = "Manage role assignments.",
-         subcommands = { CollectionRoleAssignment.CollectionListRoleAssignments.class, CollectionRoleAssignment.CollectionAssignRole.class })
+         subcommands = { CollectionRoleAssignment.CollectionListRoleAssignments.class, CollectionRoleAssignment.CollectionAssignRole.class, CollectionRoleAssignment.CollectionDeleteRole.class })
 public class CollectionRoleAssignment extends AbstractCmd {
     @ParentCommand
     static private CollectionCmd collectionCmd;
 
-    @Command(name = "list", mixinStandardHelpOptions = true, description = "List the role assignments of a Dataverse collection.")
+    @Command(name = "list",
+             mixinStandardHelpOptions = true,
+             description = "List the role assignments of a Dataverse collection.")
     static class CollectionListRoleAssignments extends AbstractCmd {
 
         @Override
@@ -73,6 +78,43 @@ collectionCmd.<RoleAssignmentParams<DataverseApi>> paramsBatchProcessorBuilder()
         }
     }
 
+    @Command(name = "remove",
+             mixinStandardHelpOptions = true,
+             description = "remove a role assignment from the specified dataverse collection")
+    static class CollectionDeleteRole extends AbstractAssignmentRole<CollectionCmd, DataverseApi> {
+
+        @Override
+        protected DataverseApi getItem(String pid) {
+            return collectionCmd.dataverseClient.dataverse(pid);
+        }
+
+        private static class RoleAssignmentAction implements ThrowingFunction<RoleAssignmentParams<DataverseApi>, String, Exception> {
+            @Override
+            public String apply(RoleAssignmentParams<DataverseApi> roleAssignmentParams) throws IOException, DataverseException {
+                if (roleAssignmentParams.roleAssignment().isPresent()) {
+                    RoleAssignment roleAssignment = roleAssignmentParams.roleAssignment().get();
+                    Optional<RoleAssignmentReadOnly> role = roleAssignmentParams.pid().listRoleAssignments().getData().stream()
+                        .filter(r -> r.get_roleAlias().equals(roleAssignment.getRole()) && r.getAssignee().equals(roleAssignment.getAssignee())).findFirst();
+                    if (role.isPresent()) {
+                        var r = roleAssignmentParams.pid().deleteRoleAssignment(role.get().getId());
+                        return r.getEnvelopeAsString();
+                    }
+                }
+                return "There was no assignment-role to assign.";
+            }
+        }
+
+        @Override
+        public void doCall() throws IOException, DataverseException {
+            collectionCmd.<RoleAssignmentParams<DataverseApi>> paramsBatchProcessorBuilder()
+                .labeledItems(getRoleAssignmentParams(collectionCmd))
+                .action(new CollectionRoleAssignment.CollectionDeleteRole.RoleAssignmentAction())
+                .report(new ConsoleReport<>())
+                .build()
+                .process();
+        }
+    }
+
     @Override
     public void doCall() throws IOException, DataverseException {
 

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

@@ -20,20 +20,25 @@
 import nl.knaw.dans.dvcli.action.ThrowingFunction;
 import nl.knaw.dans.lib.dataverse.DatasetApi;
 import nl.knaw.dans.lib.dataverse.DataverseException;
+import nl.knaw.dans.lib.dataverse.model.RoleAssignment;
+import nl.knaw.dans.lib.dataverse.model.RoleAssignmentReadOnly;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.ParentCommand;
 
 import java.io.IOException;
+import java.util.Optional;
 
 @Command(name = "role-assignment",
          mixinStandardHelpOptions = true,
          description = "Manage role assignments.",
-         subcommands = { DatasetRoleAssignment.DatasetListRoleAssignments.class, DatasetRoleAssignment.DatasetAssignRole.class })
+         subcommands = { DatasetRoleAssignment.DatasetListRoleAssignments.class, DatasetRoleAssignment.DatasetAssignRole.class, DatasetRoleAssignment.DatasetDeleteRole.class })
 public class DatasetRoleAssignment extends AbstractCmd {
     @ParentCommand
     static private DatasetCmd datasetCmd;
 
-    @Command(name = "list", mixinStandardHelpOptions = true, description = "List role assignments for the specified dataset.")
+    @Command(name = "list",
+             mixinStandardHelpOptions = true,
+             description = "List role assignments for the specified dataset.")
     static class DatasetListRoleAssignments extends AbstractCmd {
 
         @Override
@@ -74,6 +79,43 @@ datasetCmd.<RoleAssignmentParams<DatasetApi>> paramsBatchProcessorBuilder()
 
     }
 
+    @Command(name = "remove",
+             mixinStandardHelpOptions = true,
+             description = "remove role assignment from specified dataset(s)")
+    static class DatasetDeleteRole extends AbstractAssignmentRole<DatasetCmd, DatasetApi> {
+
+        @Override
+        protected DatasetApi getItem(String pid) {
+            return datasetCmd.dataverseClient.dataset(pid);
+        }
+
+        private static class RoleAssignmentAction implements ThrowingFunction<RoleAssignmentParams<DatasetApi>, String, Exception> {
+            @Override
+            public String apply(RoleAssignmentParams<DatasetApi> roleAssignmentParams) throws IOException, DataverseException {
+                if (roleAssignmentParams.roleAssignment().isPresent()) {
+                    RoleAssignment roleAssignment = roleAssignmentParams.roleAssignment().get();
+                    Optional<RoleAssignmentReadOnly> role = roleAssignmentParams.pid().listRoleAssignments().getData().stream()
+                        .filter(r -> r.get_roleAlias().equals(roleAssignment.getRole()) && r.getAssignee().equals(roleAssignment.getAssignee())).findFirst();
+                    if (role.isPresent()) {
+                        var r = roleAssignmentParams.pid().deleteRoleAssignment(role.get().getId());
+                        return r.getEnvelopeAsString();
+                    }
+                }
+                return "There was no assignment-role to assign.";
+            }
+        }
+
+        @Override
+        public void doCall() throws IOException, DataverseException {
+            datasetCmd.<RoleAssignmentParams<DatasetApi>> paramsBatchProcessorBuilder()
+                .labeledItems(getRoleAssignmentParams(datasetCmd))
+                .action(new RoleAssignmentAction())
+                .report(new ConsoleReport<>())
+                .build()
+                .process();
+        }
+    }
+
     @Override
     public void doCall() throws IOException, DataverseException {