This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new 1aec303a56 Fix importdirectory command description layout (#6562)
1aec303a56 is described below
commit 1aec303a563eaddbe75e6debaf349c0f0b5ea3a0
Author: Efe <[email protected]>
AuthorDate: Tue Sep 29 14:56:36 2026 +0300
Fix importdirectory command description layout (#6562)
Signed-off-by: Efe Gökdemir <[email protected]>
Co-authored-by: Dave Marion <[email protected]>
---
.../org/apache/accumulo/shell/commands/ImportDirectoryCommand.java | 2 +-
.../apache/accumulo/shell/commands/ImportDirectoryCommandTest.java | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git
a/shell/src/main/java/org/apache/accumulo/shell/commands/ImportDirectoryCommand.java
b/shell/src/main/java/org/apache/accumulo/shell/commands/ImportDirectoryCommand.java
index 5411098dfd..07015e68b2 100644
---
a/shell/src/main/java/org/apache/accumulo/shell/commands/ImportDirectoryCommand.java
+++
b/shell/src/main/java/org/apache/accumulo/shell/commands/ImportDirectoryCommand.java
@@ -40,7 +40,7 @@ public class ImportDirectoryCommand extends Command {
+ " table if the -t option is not provided. The boolean argument
determines if accumulo"
+ " sets the time. If the -i ignore option is supplied then no
exception will be thrown"
+ " when attempting to import files from an empty source directory. An
info log message"
- + " will be displayed indicating the source directory is empty, but no
error is thrown.\n"
+ + " will be displayed indicating the source directory is empty, but no
error is thrown."
+ " Bulk import only takes 2 arguments: <directory> true|false";
}
diff --git
a/shell/src/test/java/org/apache/accumulo/shell/commands/ImportDirectoryCommandTest.java
b/shell/src/test/java/org/apache/accumulo/shell/commands/ImportDirectoryCommandTest.java
index 58abd80311..9826878bb5 100644
---
a/shell/src/test/java/org/apache/accumulo/shell/commands/ImportDirectoryCommandTest.java
+++
b/shell/src/test/java/org/apache/accumulo/shell/commands/ImportDirectoryCommandTest.java
@@ -23,6 +23,7 @@ import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.client.admin.TableOperations;
@@ -127,4 +128,10 @@ public class ImportDirectoryCommandTest {
replay(client, cli, shellState, tableOperations, bulkImport);
cmd.execute("importdirectory in_dir false", cli, shellState);
}
+
+ @Test
+ public void testDescriptionDoesNotContainLineBreak() {
+ replay(client, cli, shellState, tableOperations, bulkImport);
+ assertFalse(cmd.description().contains("\n"));
+ }
}