DD-2236 itemstore commands (#9)

Added command line support for the new item store editing endpoints.

Author: janvanmansum

pom.xml

@@ -24,7 +24,7 @@
         <version>1.11.0</version>
     </parent>
     <artifactId>dd-data-vault-cli</artifactId>
-    <version>4.0.1-SNAPSHOT</version>
+    <version>4.1.0-SNAPSHOT</version>
     <name>DD Data Vault CLI</name>
     <scm>
         <developerConnection>scm:git:ssh://github.com/DANS-KNAW/${project.artifactId}</developerConnection>
@@ -34,7 +34,8 @@
     <properties>
         <main-class>nl.knaw.dans.datavaultcli.DataVaultCli</main-class>
         <command-name>data-vault</command-name>
-        <dd-data-vault-api.version>1.0.0</dd-data-vault-api.version>
+        <dd-data-vault-api.version>1.1.0</dd-data-vault-api.version>
+        <dans-java-utils.version>2.11.1</dans-java-utils.version>
     </properties>
     <dependencies>
         <dependency>

src/main/java/nl/knaw/dans/datavaultcli/DataVaultCli.java

@@ -31,6 +31,12 @@
 import nl.knaw.dans.datavaultcli.command.ImportStatus;
 import nl.knaw.dans.datavaultcli.command.Layer;
 import nl.knaw.dans.datavaultcli.command.LayerArchive;
+import nl.knaw.dans.datavaultcli.command.Itemstore;
+import nl.knaw.dans.datavaultcli.command.ItemstoreCopyDirectoryInto;
+import nl.knaw.dans.datavaultcli.command.ItemstoreCopyFileTo;
+import nl.knaw.dans.datavaultcli.command.ItemstoreCreateDirectory;
+import nl.knaw.dans.datavaultcli.command.ItemstoreDeleteDirectory;
+import nl.knaw.dans.datavaultcli.command.ItemstoreDeleteFile;
 import nl.knaw.dans.datavaultcli.command.LayerGetIds;
 import nl.knaw.dans.datavaultcli.command.LayerGetStatus;
 import nl.knaw.dans.datavaultcli.command.LayerNew;
@@ -117,6 +123,12 @@ public void configureCommandLine(CommandLine commandLine, DataVaultConfiguration
                 .addSubcommand(new LayerGetIds(this))
                 .addSubcommand(new LayerGetStatus(this))
                 .addSubcommand(new LayerArchive(this)))
+            .addSubcommand(new CommandLine(new Itemstore(this))
+                .addSubcommand(new ItemstoreCreateDirectory(this))
+                .addSubcommand(new ItemstoreDeleteDirectory(this))
+                .addSubcommand(new ItemstoreDeleteFile(this))
+                .addSubcommand(new ItemstoreCopyDirectoryInto(this))
+                .addSubcommand(new ItemstoreCopyFileTo(this)))
             .addSubcommand(new CopyBatch(this))
             .addSubcommand(new CommandLine(new ConsistencyCheck())
                 .addSubcommand(new ConsistencyCheckNew(this))

src/main/java/nl/knaw/dans/datavaultcli/command/Itemstore.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2022 DANS - Data Archiving and Networked Services (info@dans.knaw.nl)
+ *
+ * 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.datavaultcli.command;
+
+import lombok.RequiredArgsConstructor;
+import nl.knaw.dans.datavaultcli.Context;
+import picocli.CommandLine.Command;
+
+import java.util.concurrent.Callable;
+
+@Command(name = "itemstore",
+         mixinStandardHelpOptions = true,
+         description = "Apply low-level edits to the item store.")
+@RequiredArgsConstructor
+public class Itemstore implements Callable<Integer> {
+    private final Context context;
+
+    @Override
+    public Integer call() throws Exception {
+        return 0;
+    }
+}

src/main/java/nl/knaw/dans/datavaultcli/command/ItemstoreCopyDirectoryInto.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2022 DANS - Data Archiving and Networked Services (info@dans.knaw.nl)
+ *
+ * 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.datavaultcli.command;
+
+import lombok.RequiredArgsConstructor;
+import nl.knaw.dans.datavaultcli.Context;
+import nl.knaw.dans.datavaultcli.api.CopyDirectoryIntoRequestDto;
+import nl.knaw.dans.datavaultcli.client.ApiException;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.ParentCommand;
+import picocli.CommandLine.Parameters;
+
+import java.nio.file.Paths;
+import java.util.concurrent.Callable;
+
+@Command(name = "copy-directory-into",
+         mixinStandardHelpOptions = true,
+         description = "Copy a directory into the item store.")
+@RequiredArgsConstructor
+public class ItemstoreCopyDirectoryInto implements Callable<Integer> {
+    private final Context context;
+
+    @ParentCommand
+    private Itemstore parent;
+
+    @Parameters(index = "0", description = "The source directory path.")
+    private String source;
+
+    @Parameters(index = "1", description = "The destination directory path in the item store.")
+    private String destination;
+
+    @Override
+    public Integer call() {
+        try {
+            var absoluteSource = Paths.get(source).toAbsolutePath().normalize().toString();
+            var request = new CopyDirectoryIntoRequestDto();
+            request.setSource(absoluteSource);
+            request.setDestination(destination);
+            context.getApi().itemstoreCopyDirectoryIntoPost(request);
+            System.err.println("Copied " + absoluteSource + " to " + destination + " in respository");
+            return 0;
+        }
+        catch (ApiException e) {
+            System.err.println("Error: " + e.getMessage());
+            return 1;
+        }
+    }
+}

src/main/java/nl/knaw/dans/datavaultcli/command/ItemstoreCopyFileTo.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2022 DANS - Data Archiving and Networked Services (info@dans.knaw.nl)
+ *
+ * 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.datavaultcli.command;
+
+import lombok.RequiredArgsConstructor;
+import nl.knaw.dans.datavaultcli.Context;
+import nl.knaw.dans.datavaultcli.api.CopyFileToRequestDto;
+import nl.knaw.dans.datavaultcli.client.ApiException;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.ParentCommand;
+import picocli.CommandLine.Parameters;
+
+import java.nio.file.Paths;
+import java.util.concurrent.Callable;
+
+@Command(name = "copy-file-to",
+         mixinStandardHelpOptions = true,
+         description = "Copy a file into the item store.")
+@RequiredArgsConstructor
+public class ItemstoreCopyFileTo implements Callable<Integer> {
+    private final Context context;
+
+    @ParentCommand
+    private Itemstore parent;
+
+    @Parameters(index = "0", description = "The source file path.")
+    private String source;
+
+    @Parameters(index = "1", description = "The destination path in the item store.")
+    private String destination;
+
+    @Override
+    public Integer call() {
+        try {
+            var absoluteSource = Paths.get(source).toAbsolutePath().normalize().toString();
+            var request = new CopyFileToRequestDto();
+            request.setSource(absoluteSource);
+            request.setDestination(destination);
+            context.getApi().itemstoreCopyFileToPost(request);
+            System.err.println("Copied " + absoluteSource + " to " + destination + " in respository");
+            return 0;
+        }
+        catch (ApiException e) {
+            System.err.println("Error: " + e.getMessage());
+            return 1;
+        }
+    }
+}

src/main/java/nl/knaw/dans/datavaultcli/command/ItemstoreCreateDirectory.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2022 DANS - Data Archiving and Networked Services (info@dans.knaw.nl)
+ *
+ * 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.datavaultcli.command;
+
+import lombok.RequiredArgsConstructor;
+import nl.knaw.dans.datavaultcli.Context;
+import nl.knaw.dans.datavaultcli.api.CreateDirectoryRequestDto;
+import nl.knaw.dans.datavaultcli.client.ApiException;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.ParentCommand;
+import picocli.CommandLine.Parameters;
+
+import java.util.concurrent.Callable;
+
+@Command(name = "create-directory",
+         mixinStandardHelpOptions = true,
+         description = "Create a new directory in the item store.")
+@RequiredArgsConstructor
+public class ItemstoreCreateDirectory implements Callable<Integer> {
+    private final Context context;
+
+    @ParentCommand
+    private Itemstore parent;
+
+    @Parameters(index = "0", description = "The path to the directory to create.")
+    private String path;
+
+    @Override
+    public Integer call() {
+        try {
+            var request = new CreateDirectoryRequestDto();
+            request.setPath(path);
+            context.getApi().itemstoreCreateDirectoryPost(request);
+            System.err.println("Created directory " + path + " in respository");
+            return 0;
+        }
+        catch (ApiException e) {
+            System.err.println("Error: " + e.getMessage());
+            return 1;
+        }
+    }
+}

src/main/java/nl/knaw/dans/datavaultcli/command/ItemstoreDeleteDirectory.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2022 DANS - Data Archiving and Networked Services (info@dans.knaw.nl)
+ *
+ * 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.datavaultcli.command;
+
+import lombok.RequiredArgsConstructor;
+import nl.knaw.dans.datavaultcli.Context;
+import nl.knaw.dans.datavaultcli.api.DeleteDirectoryRequestDto;
+import nl.knaw.dans.datavaultcli.client.ApiException;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.ParentCommand;
+import picocli.CommandLine.Parameters;
+
+import java.util.concurrent.Callable;
+
+@Command(name = "delete-directory",
+         mixinStandardHelpOptions = true,
+         description = "Delete a directory from the item store.")
+@RequiredArgsConstructor
+public class ItemstoreDeleteDirectory implements Callable<Integer> {
+    private final Context context;
+
+    @ParentCommand
+    private Itemstore parent;
+
+    @Parameters(index = "0", description = "The path to the directory to delete.")
+    private String path;
+
+    @Override
+    public Integer call() {
+        try {
+            var request = new DeleteDirectoryRequestDto();
+            request.setPath(path);
+            context.getApi().itemstoreDeleteDirectoryPost(request);
+            System.err.println("Deleted directory " + path + " from respository");
+            return 0;
+        }
+        catch (ApiException e) {
+            System.err.println("Error: " + e.getMessage());
+            return 1;
+        }
+    }
+}

src/main/java/nl/knaw/dans/datavaultcli/command/ItemstoreDeleteFile.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2022 DANS - Data Archiving and Networked Services (info@dans.knaw.nl)
+ *
+ * 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.datavaultcli.command;
+
+import lombok.RequiredArgsConstructor;
+import nl.knaw.dans.datavaultcli.Context;
+import nl.knaw.dans.datavaultcli.api.DeleteFilesRequestDto;
+import nl.knaw.dans.datavaultcli.client.ApiException;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.ParentCommand;
+import picocli.CommandLine.Parameters;
+
+import java.util.List;
+import java.util.concurrent.Callable;
+
+@Command(name = "delete-file",
+         mixinStandardHelpOptions = true,
+         description = "Delete a file from the item store.")
+@RequiredArgsConstructor
+public class ItemstoreDeleteFile implements Callable<Integer> {
+    private final Context context;
+
+    @ParentCommand
+    private Itemstore parent;
+
+    @Parameters(index = "0", description = "The path to the file to delete.")
+    private String path;
+
+    @Override
+    public Integer call() {
+        try {
+            var request = new DeleteFilesRequestDto();
+            request.setPaths(List.of(path));
+            context.getApi().itemstoreDeleteFilesPost(request);
+            System.err.println("Deleted file " + path + " from respository");
+            return 0;
+        }
+        catch (ApiException e) {
+            System.err.println("Error: " + e.getMessage());
+            return 1;
+        }
+    }
+}