Improve required-argument opt validation

Make sure non-empty opt values are present in the parsers' custom validation, or jsimpleopt will throw exceptions with stylistically inconsisent messages.
bisq-network · Mar 5, 2021 · d01a7b7 · d01a7b7
1 parent 62ff79d
commit d01a7b7
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 29 deletions.
diff --git a/cli/src/main/java/bisq/cli/opts/CancelOfferOptionParser.java b/cli/src/main/java/bisq/cli/opts/CancelOfferOptionParser.java
@@ -38,7 +38,7 @@ public CancelOfferOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(offerIdOpt))
+        if (!options.has(offerIdOpt) || options.valueOf(offerIdOpt).isEmpty())
             throw new IllegalArgumentException("no offer id specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/CreateOfferOptionParser.java b/cli/src/main/java/bisq/cli/opts/CreateOfferOptionParser.java
@@ -70,22 +70,28 @@ public CreateOfferOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(paymentAccountIdOpt))
+        if (!options.has(paymentAccountIdOpt) || options.valueOf(paymentAccountIdOpt).isEmpty())
             throw new IllegalArgumentException("no payment account id specified");
 
-        if (!options.has(directionOpt))
+        if (!options.has(directionOpt) || options.valueOf(directionOpt).isEmpty())
             throw new IllegalArgumentException("no direction (buy|sell) specified");
 
-        if (!options.has(currencyCodeOpt))
+        if (!options.has(currencyCodeOpt) || options.valueOf(currencyCodeOpt).isEmpty())
             throw new IllegalArgumentException("no currency code specified");
 
-        if (!options.has(amountOpt))
+        if (!options.has(amountOpt) || options.valueOf(amountOpt).isEmpty())
             throw new IllegalArgumentException("no btc amount specified");
 
         if (!options.has(mktPriceMarginOpt) && !options.has(fixedPriceOpt))
             throw new IllegalArgumentException("no market price margin or fixed price specified");
 
-        if (!options.has(securityDepositOpt))
+        if (options.has(mktPriceMarginOpt) && options.valueOf(mktPriceMarginOpt).isEmpty())
+            throw new IllegalArgumentException("no market price margin specified");
+
+        if (options.has(fixedPriceOpt) && options.valueOf(fixedPriceOpt).isEmpty())
+            throw new IllegalArgumentException("no fixed price specified");
+
+        if (!options.has(securityDepositOpt) || options.valueOf(securityDepositOpt).isEmpty())
             throw new IllegalArgumentException("no security deposit specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/CreatePaymentAcctOptionParser.java b/cli/src/main/java/bisq/cli/opts/CreatePaymentAcctOptionParser.java
@@ -43,7 +43,7 @@ public CreatePaymentAcctOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(paymentAcctFormPathOpt))
+        if (!options.has(paymentAcctFormPathOpt) || options.valueOf(paymentAcctFormPathOpt).isEmpty())
             throw new IllegalArgumentException("no path to json payment account form specified");
 
         Path path = Paths.get(options.valueOf(paymentAcctFormPathOpt));

diff --git a/cli/src/main/java/bisq/cli/opts/GetAddressBalanceOptionParser.java b/cli/src/main/java/bisq/cli/opts/GetAddressBalanceOptionParser.java
@@ -38,7 +38,7 @@ public GetAddressBalanceOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(addressOpt))
+        if (!options.has(addressOpt) || options.valueOf(addressOpt).isEmpty())
             throw new IllegalArgumentException("no address specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/GetBTCMarketPriceOptionParser.java b/cli/src/main/java/bisq/cli/opts/GetBTCMarketPriceOptionParser.java
@@ -38,7 +38,7 @@ public GetBTCMarketPriceOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(currencyCodeOpt))
+        if (!options.has(currencyCodeOpt) || options.valueOf(currencyCodeOpt).isEmpty())
             throw new IllegalArgumentException("no currency code specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/GetOfferOptionParser.java b/cli/src/main/java/bisq/cli/opts/GetOfferOptionParser.java
@@ -38,7 +38,7 @@ public GetOfferOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(offerIdOpt))
+        if (!options.has(offerIdOpt) || options.valueOf(offerIdOpt).isEmpty())
             throw new IllegalArgumentException("no offer id specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/GetOffersOptionParser.java b/cli/src/main/java/bisq/cli/opts/GetOffersOptionParser.java
@@ -42,10 +42,10 @@ public GetOffersOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(directionOpt))
+        if (!options.has(directionOpt) || options.valueOf(directionOpt).isEmpty())
             throw new IllegalArgumentException("no direction (buy|sell) specified");
 
-        if (!options.has(currencyCodeOpt))
+        if (!options.has(currencyCodeOpt) || options.valueOf(currencyCodeOpt).isEmpty())
             throw new IllegalArgumentException("no currency code specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/GetPaymentAcctFormOptionParser.java b/cli/src/main/java/bisq/cli/opts/GetPaymentAcctFormOptionParser.java
@@ -39,7 +39,7 @@ public GetPaymentAcctFormOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(paymentMethodIdOpt))
+        if (!options.has(paymentMethodIdOpt) || options.valueOf(paymentMethodIdOpt).isEmpty())
             throw new IllegalArgumentException("no payment method id specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/GetTradeOptionParser.java b/cli/src/main/java/bisq/cli/opts/GetTradeOptionParser.java
@@ -44,7 +44,7 @@ public GetTradeOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(tradeIdOpt))
+        if (!options.has(tradeIdOpt) || options.valueOf(tradeIdOpt).isEmpty())
             throw new IllegalArgumentException("no trade id specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/GetTransactionOptionParser.java b/cli/src/main/java/bisq/cli/opts/GetTransactionOptionParser.java
@@ -38,7 +38,7 @@ public GetTransactionOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(txIdOpt))
+        if (!options.has(txIdOpt) || options.valueOf(txIdOpt).isEmpty())
             throw new IllegalArgumentException("no tx id specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/RegisterDisputeAgentOptionParser.java b/cli/src/main/java/bisq/cli/opts/RegisterDisputeAgentOptionParser.java
@@ -42,10 +42,10 @@ public RegisterDisputeAgentOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(disputeAgentTypeOpt))
+        if (!options.has(disputeAgentTypeOpt) || options.valueOf(disputeAgentTypeOpt).isEmpty())
             throw new IllegalArgumentException("no dispute agent type specified");
 
-        if (!options.has(registrationKeyOpt))
+        if (!options.has(registrationKeyOpt) || options.valueOf(registrationKeyOpt).isEmpty())
             throw new IllegalArgumentException("no registration key specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/RemoveWalletPasswordOptionParser.java b/cli/src/main/java/bisq/cli/opts/RemoveWalletPasswordOptionParser.java
@@ -38,7 +38,7 @@ public RemoveWalletPasswordOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(passwordOpt))
+        if (!options.has(passwordOpt) || options.valueOf(passwordOpt).isEmpty())
             throw new IllegalArgumentException("no password specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/SendBsqOptionParser.java b/cli/src/main/java/bisq/cli/opts/SendBsqOptionParser.java
@@ -48,10 +48,10 @@ public SendBsqOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(addressOpt))
+        if (!options.has(addressOpt) || options.valueOf(addressOpt).isEmpty())
             throw new IllegalArgumentException("no bsq address specified");
 
-        if (!options.has(amountOpt))
+        if (!options.has(amountOpt) || options.valueOf(amountOpt).isEmpty())
             throw new IllegalArgumentException("no bsq amount specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/SendBtcOptionParser.java b/cli/src/main/java/bisq/cli/opts/SendBtcOptionParser.java
@@ -53,10 +53,10 @@ public SendBtcOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(addressOpt))
+        if (!options.has(addressOpt) || options.valueOf(addressOpt).isEmpty())
             throw new IllegalArgumentException("no btc address specified");
 
-        if (!options.has(amountOpt))
+        if (!options.has(amountOpt) || options.valueOf(amountOpt).isEmpty())
             throw new IllegalArgumentException("no btc amount specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/SetTxFeeRateOptionParser.java b/cli/src/main/java/bisq/cli/opts/SetTxFeeRateOptionParser.java
@@ -39,7 +39,7 @@ public SetTxFeeRateOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(feeRateOpt))
+        if (!options.has(feeRateOpt) || options.valueOf(feeRateOpt).isEmpty())
             throw new IllegalArgumentException("no tx fee rate specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/SetWalletPasswordOptionParser.java b/cli/src/main/java/bisq/cli/opts/SetWalletPasswordOptionParser.java
@@ -44,7 +44,7 @@ public SetWalletPasswordOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(passwordOpt))
+        if (!options.has(passwordOpt) || options.valueOf(passwordOpt).isEmpty())
             throw new IllegalArgumentException("no password specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/TakeOfferOptionParser.java b/cli/src/main/java/bisq/cli/opts/TakeOfferOptionParser.java
@@ -47,10 +47,10 @@ public TakeOfferOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(offerIdOpt))
+        if (!options.has(offerIdOpt) || options.valueOf(offerIdOpt).isEmpty())
             throw new IllegalArgumentException("no offer id specified");
 
-        if (!options.has(paymentAccountIdOpt))
+        if (!options.has(paymentAccountIdOpt) || options.valueOf(paymentAccountIdOpt).isEmpty())
             throw new IllegalArgumentException("no payment account id specified");
 
         return this;

diff --git a/cli/src/main/java/bisq/cli/opts/UnlockWalletOptionParser.java b/cli/src/main/java/bisq/cli/opts/UnlockWalletOptionParser.java
@@ -44,7 +44,7 @@ public UnlockWalletOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(passwordOpt))
+        if (!options.has(passwordOpt) || options.valueOf(passwordOpt).isEmpty())
             throw new IllegalArgumentException("no password specified");
 
         if (!options.has(unlockTimeoutOpt) || options.valueOf(unlockTimeoutOpt) <= 0)

diff --git a/cli/src/main/java/bisq/cli/opts/WithdrawFundsOptionParser.java b/cli/src/main/java/bisq/cli/opts/WithdrawFundsOptionParser.java
@@ -48,10 +48,10 @@ public WithdrawFundsOptionParser parse() {
         if (options.has(helpOpt))
             return this;
 
-        if (!options.has(tradeIdOpt))
+        if (!options.has(tradeIdOpt) || options.valueOf(tradeIdOpt).isEmpty())
             throw new IllegalArgumentException("no trade id specified");
 
-        if (!options.has(addressOpt))
+        if (!options.has(addressOpt) || options.valueOf(addressOpt).isEmpty())
             throw new IllegalArgumentException("no destination address specified");
 
         return this;