--- a/src/CLIParser.h Sun May 01 18:23:45 2022 +0200
+++ b/src/CLIParser.h Sun May 01 22:27:32 2022 +0200
@@ -37,20 +37,10 @@
else throw relpipe::cli::RelpipeCLIException(L"Missing CLI argument" + (i > 0 ? (L" after " + arguments[i - 1]) : L""), relpipe::cli::CLI::EXIT_CODE_BAD_CLI_ARGUMENTS);
}
- /**
- * TODO: use a common method
- */
- bool parseBoolean(const relpipe::common::type::StringX& value) {
- if (value == L"true") return true;
- else if (value == L"false") return false;
- else throw relpipe::cli::RelpipeCLIException(L"Unable to parse boolean value: " + value + L" (expecting true or false)", relpipe::cli::CLI::EXIT_CODE_BAD_CLI_ARGUMENTS);
- }
-
public:
static const relpipe::writer::string_t OPTION_RELATION;
- static const relpipe::writer::string_t OPTION_UNLINK_ON_CLOSE;
- static const relpipe::writer::string_t OPTION_QUEUE;
+ static const relpipe::writer::string_t OPTION_ENDPOINT_URL;
static const relpipe::writer::string_t OPTION_MESSAGE_COUNT;
Configuration parse(const std::vector<relpipe::writer::string_t>& arguments) {
@@ -58,13 +48,11 @@
for (int i = 0; i < arguments.size();) {
relpipe::writer::string_t option = readNext(arguments, i);
-
+
if (option == OPTION_RELATION) {
c.relation = readNext(arguments, i);
- } else if (option == OPTION_UNLINK_ON_CLOSE) {
- c.unlinkOnClose = parseBoolean(readNext(arguments, i));
- } else if (option == OPTION_QUEUE) {
- c.queue = readNext(arguments, i);
+ } else if (option == OPTION_ENDPOINT_URL) {
+ c.endpointUrl = readNext(arguments, i);
} else if (option == OPTION_MESSAGE_COUNT) {
c.messageCount = std::stoull(readNext(arguments, i));
} else throw relpipe::cli::RelpipeCLIException(L"Unsupported CLI option: " + option, relpipe::cli::CLI::EXIT_CODE_BAD_CLI_ARGUMENTS);
@@ -78,8 +66,7 @@
};
const relpipe::writer::string_t CLIParser::OPTION_RELATION = L"--relation";
-const relpipe::writer::string_t CLIParser::OPTION_UNLINK_ON_CLOSE = L"--unlink-on-close";
-const relpipe::writer::string_t CLIParser::OPTION_QUEUE = L"--queue";
+const relpipe::writer::string_t CLIParser::OPTION_ENDPOINT_URL = L"--endpoint-url";
const relpipe::writer::string_t CLIParser::OPTION_MESSAGE_COUNT = L"--message-count";
}