honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add user prompting to BaseCommand

This commit is contained in:
James Agnew 2018-08-18 15:04:14 -04:00
parent 6511545d25
commit a40b7fe7d3
2 changed files with 84 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseCommand.java
View File

@ -43,15 +43,13 @@ import org.slf4j.LoggerFactory;
import org.springframework.util.Base64Utils;
import java.io.*;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import java.util.zip.GZIPInputStream;
import static org.apache.commons.lang3.StringUtils.*;
import static org.fusesource.jansi.Ansi.ansi;
public abstract class BaseCommand implements Comparable<BaseCommand> {
protected static final String BASE_URL_PARAM = "t";
@ -89,6 +87,25 @@ public abstract class BaseCommand implements Comparable<BaseCommand> {
addOptionalOption(theOptions, null, BEARER_TOKEN_PARAM_LONGOPT, BEARER_TOKEN_PARAM_NAME, BEARER_TOKEN_PARAM_DESC);
}
protected String promptUser(String thePrompt) throws ParseException {
System.out.print(ansi().bold().fgBrightDefault());
System.out.print(thePrompt);
System.out.print(ansi().bold().fgBrightGreen());
System.out.flush();
BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
String retVal;
try {
retVal = reader.readLine();
} catch (IOException e) {
throw new ParseException("Failed to read input from user: "+ e.toString());
}
System.out.print(ansi().boldOff().fgDefault());
return retVal;
}
protected void addFhirVersionOption(Options theOptions) {
String versions = Arrays.stream(FhirVersionEnum.values())
.filter(t -> t != FhirVersionEnum.DSTU2_1 && t != FhirVersionEnum.DSTU2_HL7ORG)
@ -98,6 +115,8 @@ public abstract class BaseCommand implements Comparable<BaseCommand> {
addRequiredOption(theOptions, FHIR_VERSION_PARAM, FHIR_VERSION_PARAM_LONGOPT, FHIR_VERSION_PARAM_NAME, FHIR_VERSION_PARAM_DESC + versions);
}
private void addOption(Options theOptions, OptionGroup theOptionGroup, boolean theRequired, String theOpt, String theLongOpt, boolean theHasArgument, String theArgumentName, String theDescription) {
Option option = createOption(theRequired, theOpt, theLongOpt, theHasArgument, theDescription);
if (theHasArgument && isNotBlank(theArgumentName)) {
@ -195,7 +214,7 @@ public abstract class BaseCommand implements Comparable<BaseCommand> {
buffer.write(data, 0, nRead);
long fileSize = FileUtils.sizeOf(localFile);
if (fileSize > nextLog) {
System.err.print("\r" + Ansi.ansi().eraseLine());
System.err.print("\r" + ansi().eraseLine());
System.err.print(FileUtils.byteCountToDisplaySize(fileSize));
if (maxLength > 0) {
System.err.print(" [");

60
hapi-fhir-cli/hapi-fhir-cli-api/src/test/java/ca/uhn/fhir/cli/BaseCommandTest.java Normal file
View File

@ -0,0 +1,60 @@
package ca.uhn.fhir.cli;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.junit.Test;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import static org.junit.Assert.assertEquals;
public class BaseCommandTest {
@Test
public void testUserPrompt() throws ParseException {
InputStream stdin = System.in;
try {
System.setIn(new ByteArrayInputStream("A VALUE".getBytes()));
String value = new MyBaseCommand().read();
assertEquals("A VALUE", value);
} finally {
System.setIn(stdin);
}
}
private static class MyBaseCommand extends BaseCommand {
@Override
public String getCommandDescription() {
return null;
}
String read() throws ParseException {
return promptUser("Enter a String: ");
}
@Override
public String getCommandName() {
return null;
}
@Override
public Options getOptions() {
return null;
}
@Override
public void run(CommandLine theCommandLine) {
}
}
public static void main(String[] theValue) throws ParseException {
new BaseCommandTest().testUserPrompt();
}
}