From e7630f83c1d043bebbd84893cafe3bf1a6974faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Efe=20G=C3=B6kdemir?= Date: Thu, 24 Sep 2026 08:51:47 +0300 Subject: [PATCH 1/2] Fix importdirectory command description layout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Efe Gökdemir --- .../accumulo/shell/commands/ImportDirectoryCommand.java | 2 +- .../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 5411098dfd8..bc15be0f92d 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 String description() { + " 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: 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 58abd803119..9826878bb53 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.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 void testPassTableOptCmdForm() throws Exception { 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")); + } } From ed4ae2f8a7e5c9cb682e7fc1352b33973ce8ceb9 Mon Sep 17 00:00:00 2001 From: Dave Marion Date: Tue, 29 Sep 2026 07:27:01 -0400 Subject: [PATCH 2/2] Apply suggestion from @dlmarion --- .../apache/accumulo/shell/commands/ImportDirectoryCommand.java | 2 +- 1 file changed, 1 insertion(+), 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 bc15be0f92d..07015e68b21 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 String description() { + " 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. " + + " will be displayed indicating the source directory is empty, but no error is thrown." + " Bulk import only takes 2 arguments: true|false"; }