Skip to content

Commit

Permalink
updates from PR feedback #2
Browse files Browse the repository at this point in the history
  • Loading branch information
Andy Kwong committed Nov 29, 2021
1 parent bc4a9fe commit d99d80f
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 28 deletions.
3 changes: 2 additions & 1 deletion ...n-sample/src/main/java/samples/com/microsoft/azure/sdk/iot/DeviceClientManagerSample.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public static void main(String[] args)

IotHubClientProtocol argProtocol;
String protocol = params.getTransport().toLowerCase();

switch (protocol)
{
case "https":
Expand All @@ -54,7 +55,7 @@ public static void main(String[] args)
argProtocol = IotHubClientProtocol.MQTT_WS;
break;
default:
throw new IllegalArgumentException("[ERROR] Do not support protocol: [" + protocol + "]");
throw new IllegalArgumentException("Unsupported protocol: [" + protocol + "]");
}
log.debug("Setup parameter: Protocol = [{}]", protocol);

Expand Down
45 changes: 18 additions & 27 deletions ...connection-sample/src/main/java/samples/com/microsoft/azure/sdk/iot/SampleParameters.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Licensed under the MIT License.
package samples.com.microsoft.azure.sdk.iot;

import com.azure.core.http.policy.HttpLogDetailLevel;

import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
Expand All @@ -18,14 +16,14 @@

public class SampleParameters {

private static final String _DEVICE_CONNECTION_STRING = System.getenv("IOTHUB_DEVICE_CONNECTION_STRING");
private static final String _TRANSPORT = "mqtt";
private static final String _NUM_REQUESTS = "3";
private static final String _SLEEP_DURATION_IN_SECONDS = "10";
private static final String _TIMEOUT_IN_MINUTES = "1";
private static final String DEVICE_CONNECTION_STRING = System.getenv("IOTHUB_DEVICE_CONNECTION_STRING");
private static final String TRANSPORT = "mqtt";
private static final String NUM_REQUESTS = "3";
private static final String SLEEP_DURATION_IN_SECONDS = "10";
private static final String TIMEOUT_IN_MINUTES = "1";

private static final String _FOOTER = "\nFor more info, please refer to https://github.com/Azure/azure-iot-sdks";
private static final String _APPEXE = "java -jar ";
private static final String FOOTER = "\nFor more info, please refer to https://github.com/Azure/azure-iot-sdks";
private static final String APPEXE = "java -jar ";

private static CommandLine cmd = null;
private static String[] connections = new String[2];
Expand All @@ -52,16 +50,9 @@ public SampleParameters(String[] args) {
.desc("Primary device connection string; required argument unless setup with environment variable \"IOTHUB_DEVICE_CONNECTION_STRING\"")
.build()
)
.addOption(
Option.builder("s")
.longOpt("secondaryConnectionString")
.hasArg()
.desc("Secondary device connection string (optional)")
.build()
)
.addOption(
Option.builder("t")
.longOpt("transportType")
.longOpt("transportProtocol")
.hasArg()
.desc("Transport protocol [mqtt | https | amqps| amqps_ws | mqtt_ws] (optional); defaults to \"mqtt\"")
.build()
Expand Down Expand Up @@ -89,7 +80,7 @@ public SampleParameters(String[] args) {
);

//Get command line string
String cmdLine = _APPEXE;
String cmdLine = APPEXE;
try {
String jarPath = Options.class
.getProtectionDomain()
Expand All @@ -115,7 +106,7 @@ public SampleParameters(String[] args) {
//Help option
if (cmd.hasOption("h"))
{
formatter.printHelp(cmdLine, "\nHelp:\n\n", options, _FOOTER, true);
formatter.printHelp(cmdLine, "\nHelp:\n\n", options, FOOTER, true);
System.exit(0);
}

Expand All @@ -125,16 +116,16 @@ public SampleParameters(String[] args) {
connections[0] = cmd.getOptionValue("p");
if (connections[0] == null || connections[0].trim().isEmpty())
{
formatter.printHelp(cmdLine, "\nError: Connection is empty\n\n", options, _FOOTER, true);
formatter.printHelp(cmdLine, "\nError: Connection is empty\n\n", options, FOOTER, true);
System.exit(0);
}
}
else
{
connections[0] = _DEVICE_CONNECTION_STRING;
connections[0] = DEVICE_CONNECTION_STRING;
if (connections[0] == null || connections[0].trim().isEmpty())
{
formatter.printHelp(cmdLine, "\nError: Connection is required as argument or as environment variable\n\n", options, _FOOTER, true);
formatter.printHelp(cmdLine, "\nError: Connection is required as argument or as environment variable\n\n", options, FOOTER, true);
System.exit(0);
}
}
Expand All @@ -147,7 +138,7 @@ public SampleParameters(String[] args) {

} catch (ParseException e) {
//wrong parameters
formatter.printHelp(cmdLine, "\nError: "+e.getMessage()+"\n\n", options, _FOOTER, true);
formatter.printHelp(cmdLine, "\nError: "+e.getMessage()+"\n\n", options, FOOTER, true);

System.exit(0);
}
Expand All @@ -168,7 +159,7 @@ public String[] getConnectionStrings()
*/
public String getTransport()
{
return cmd.getOptionValue("t", _TRANSPORT);
return cmd.getOptionValue("t", TRANSPORT);
}

/**
Expand All @@ -177,7 +168,7 @@ public String getTransport()
*/
public String getNumRequests()
{
return cmd.getOptionValue("r", _NUM_REQUESTS);
return cmd.getOptionValue("r", NUM_REQUESTS);
}

/**
Expand All @@ -186,7 +177,7 @@ public String getNumRequests()
*/
public String getSleepDuration()
{
return cmd.getOptionValue("d", _SLEEP_DURATION_IN_SECONDS);
return cmd.getOptionValue("d", SLEEP_DURATION_IN_SECONDS);
}

/**
Expand All @@ -195,7 +186,7 @@ public String getSleepDuration()
*/
public String getTimeout()
{
return cmd.getOptionValue("o", _TIMEOUT_IN_MINUTES);
return cmd.getOptionValue("o", TIMEOUT_IN_MINUTES);
}

}

0 comments on commit d99d80f

Please sign in to comment.