ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-04 17:53:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-3688: Apply @Named annotation to CRaSH commands to fix usage messages. (#6126)

Browse Source
This commit is contained in:
Chris Rankin 2020-04-03 08:35:01 +01:00 committed by GitHub
parent b340766506
commit 032f008e7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/shell/src/main/java/net/corda/tools/shell/AttachmentShellCommand.java
View File

@ -2,10 +2,12 @@ package net.corda.tools.shell;
import org.crsh.cli.Command; import org.crsh.cli.Command;
import org.crsh.cli.Man; import org.crsh.cli.Man;
import org.crsh.cli.Named;
import org.crsh.cli.Usage; import org.crsh.cli.Usage;
import static net.corda.tools.shell.InteractiveShell.runAttachmentTrustInfoView; import static net.corda.tools.shell.InteractiveShell.runAttachmentTrustInfoView;
@Named("attachments")
public class AttachmentShellCommand extends InteractiveShellCommand { public class AttachmentShellCommand extends InteractiveShellCommand {
@Command @Command

2
tools/shell/src/main/java/net/corda/tools/shell/CheckpointShellCommand.java
View File

@ -2,10 +2,12 @@ package net.corda.tools.shell;
import org.crsh.cli.Command; import org.crsh.cli.Command;
import org.crsh.cli.Man; import org.crsh.cli.Man;
import org.crsh.cli.Named;
import org.crsh.cli.Usage; import org.crsh.cli.Usage;
import static net.corda.tools.shell.InteractiveShell.*; import static net.corda.tools.shell.InteractiveShell.*;
@Named("checkpoints")
public class CheckpointShellCommand extends InteractiveShellCommand { public class CheckpointShellCommand extends InteractiveShellCommand {
@Command @Command

1
tools/shell/src/main/java/net/corda/tools/shell/FlowShellCommand.java
View File

@ -26,6 +26,7 @@ import static net.corda.tools.shell.InteractiveShell.runStateMachinesView;
"command with either a full class name, or a substring of the class name that's unambiguous. The parameters to the \n" + "command with either a full class name, or a substring of the class name that's unambiguous. The parameters to the \n" +
"flow constructors (the right one is picked automatically) are then specified using the same syntax as for the run command." "flow constructors (the right one is picked automatically) are then specified using the same syntax as for the run command."
) )
@Named("flow")
public class FlowShellCommand extends InteractiveShellCommand { public class FlowShellCommand extends InteractiveShellCommand {
private static final Logger logger = LoggerFactory.getLogger(FlowShellCommand.class); private static final Logger logger = LoggerFactory.getLogger(FlowShellCommand.class);

2
tools/shell/src/main/java/net/corda/tools/shell/HashLookupShellCommand.java
View File

@ -6,6 +6,7 @@ import net.corda.core.messaging.StateMachineTransactionMapping;
import org.crsh.cli.Argument; import org.crsh.cli.Argument;
import org.crsh.cli.Command; import org.crsh.cli.Command;
import org.crsh.cli.Man; import org.crsh.cli.Man;
import org.crsh.cli.Named;
import org.crsh.cli.Usage; import org.crsh.cli.Usage;
import org.crsh.text.Color; import org.crsh.text.Color;
import org.crsh.text.Decoration; import org.crsh.text.Decoration;
@ -15,6 +16,7 @@ import org.slf4j.LoggerFactory;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@Named("hashLookup")
public class HashLookupShellCommand extends InteractiveShellCommand { public class HashLookupShellCommand extends InteractiveShellCommand {
private static Logger logger = LoggerFactory.getLogger(HashLookupShellCommand.class); private static Logger logger = LoggerFactory.getLogger(HashLookupShellCommand.class);

2
tools/shell/src/main/java/net/corda/tools/shell/OutputFormatCommand.java
View File

@ -7,6 +7,7 @@ import net.corda.tools.shell.InteractiveShell.OutputFormat;
import org.crsh.cli.Argument; import org.crsh.cli.Argument;
import org.crsh.cli.Command; import org.crsh.cli.Command;
import org.crsh.cli.Man; import org.crsh.cli.Man;
import org.crsh.cli.Named;
import org.crsh.cli.Usage; import org.crsh.cli.Usage;
import org.crsh.command.InvocationContext; import org.crsh.command.InvocationContext;
import org.crsh.command.ScriptException; import org.crsh.command.ScriptException;
@ -16,6 +17,7 @@ import java.util.Map;
@Man("Allows you to see and update the format that's currently used for the commands' output.") @Man("Allows you to see and update the format that's currently used for the commands' output.")
@Usage("Allows you to see and update the format that's currently used for the commands' output.") @Usage("Allows you to see and update the format that's currently used for the commands' output.")
@Named("output-format")
public class OutputFormatCommand extends InteractiveShellCommand { public class OutputFormatCommand extends InteractiveShellCommand {
public OutputFormatCommand() {} public OutputFormatCommand() {}

2
tools/shell/src/main/java/net/corda/tools/shell/RunShellCommand.java
View File

@ -7,6 +7,7 @@ import net.corda.core.messaging.CordaRPCOps;
import org.crsh.cli.Argument; import org.crsh.cli.Argument;
import org.crsh.cli.Command; import org.crsh.cli.Command;
import org.crsh.cli.Man; import org.crsh.cli.Man;
import org.crsh.cli.Named;
import org.crsh.cli.Usage; import org.crsh.cli.Usage;
import org.crsh.command.InvocationContext; import org.crsh.command.InvocationContext;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -23,6 +24,7 @@ import static java.util.Comparator.comparing;
// Note that this class cannot be converted to Kotlin because CRaSH does not understand InvocationContext<Map<?, ?>> which // Note that this class cannot be converted to Kotlin because CRaSH does not understand InvocationContext<Map<?, ?>> which
// is the closest you can get in Kotlin to raw types. // is the closest you can get in Kotlin to raw types.
@Named("run")
public class RunShellCommand extends InteractiveShellCommand { public class RunShellCommand extends InteractiveShellCommand {
private static final Logger logger = LoggerFactory.getLogger(RunShellCommand.class); private static final Logger logger = LoggerFactory.getLogger(RunShellCommand.class);

1
tools/shell/src/main/java/net/corda/tools/shell/StartShellCommand.java
View File

@ -12,6 +12,7 @@ import java.util.*;
import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.joining;
@Named("start")
public class StartShellCommand extends InteractiveShellCommand { public class StartShellCommand extends InteractiveShellCommand {
private static Logger logger = LoggerFactory.getLogger(StartShellCommand.class); private static Logger logger = LoggerFactory.getLogger(StartShellCommand.class);