Skip to content

Fix importdirectory command description layout #6562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlmarion merged 2 commits into from
Sep 29, 2026
Merged

Fix importdirectory command description layout #6562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7630f8
Fix importdirectory command description layout
efegokdemir Sep 24, 2026
ed4ae2f
Apply suggestion from @dlmarion
dlmarion Sep 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shell/src/main/java/org/apache/accumulo/shell/commands/ImportDirectoryCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: <directory> true|false";
}
Comment thread
dlmarion marked this conversation as resolved.

Expand Down
7 changes: 7 additions & 0 deletions shell/src/test/java/org/apache/accumulo/shell/commands/ImportDirectoryCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"));
}
}
Loading