Skip to content

Commit 024a8cc

Browse files
author
[a561842] Hubert Marteau
committed
Synchronization of properties naming.
Initial valorization of every propertie.
1 parent e04f0b0 commit 024a8cc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1332
-447
lines changed

‎install.sh‎

100755100644
File mode changed.

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.multichainjavaapi</groupId>
55
<artifactId>MultiChainJavaAPI</artifactId>
6-
<version>0.4.12-SNAPSHOT</version>
6+
<version>0.4.14-SNAPSHOT</version>
77

88
<properties>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎src/main/java/multichain/command/AddressCommand.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212

1313
import multichain.command.builders.QueryBuilderAddress;
1414
import multichain.object.Address;
15-
import multichain.object.BalanceAsset;
15+
import multichain.object.BalanceAssetGeneral;
1616
import multichain.object.KeyPairs;
1717
import multichain.object.MultiBalance;
1818
import multichain.object.formatters.AddressFormatter;
1919
import multichain.object.formatters.BalanceFormatter;
2020

2121
/**
2222
* @author Ub - H. MARTEAU
23-
* @version 4.4
23+
* @version 4.13
2424
*/
2525
public class AddressCommand extends QueryBuilderAddress {
2626

@@ -331,11 +331,11 @@ public MultiBalance getMultiBalances() throws MultichainException {
331331
* @throws MultichainException
332332
*/
333333
@SuppressWarnings("unchecked")
334-
public List<BalanceAsset> getAddressBalances(String address) throws MultichainException {
335-
List<BalanceAsset> balance = new ArrayList<BalanceAsset>();
334+
public List<BalanceAssetGeneral> getAddressBalances(String address) throws MultichainException {
335+
List<BalanceAssetGeneral> balance = new ArrayList<BalanceAssetGeneral>();
336336

337337
Object objectBalances = executeGetAddressBalances(address);
338-
balance = BalanceFormatter.formatBalanceAssets((ArrayList<Object>) objectBalances);
338+
balance = BalanceFormatter.formatBalanceAssetsGeneral((ArrayList<Object>) objectBalances);
339339

340340
return balance;
341341
}

‎src/main/java/multichain/command/BalanceCommand.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
import java.util.List;
1212

1313
import multichain.command.builders.QueryBuilderBalance;
14-
import multichain.object.BalanceAsset;
14+
import multichain.object.BalanceAssetGeneral;
1515
import multichain.object.formatters.BalanceFormatter;
1616

1717
/**
1818
* @author Ub - H. MARTEAU
19-
* @version 3.0
19+
* @version 4.13
2020
*/
2121
public class BalanceCommand extends QueryBuilderBalance {
2222
public BalanceCommand(String ip, String port, String login, String password) {
@@ -44,14 +44,14 @@ public BalanceCommand(String ip, String port, String login, String password) {
4444
* @throws MultichainException
4545
*/
4646
@SuppressWarnings("unchecked")
47-
public List<BalanceAsset> getTotalBalances() throws MultichainException {
48-
List<BalanceAsset> listBalanceAsset = new ArrayList<BalanceAsset>();
47+
public List<BalanceAssetGeneral> getTotalBalances() throws MultichainException {
48+
List<BalanceAssetGeneral> listBalanceAsset = new ArrayList<BalanceAssetGeneral>();
4949

5050
Object objectBalanceAsset = executeGetTotalBalances();
5151

5252
if (verifyInstance(objectBalanceAsset, ArrayList.class)
53-
&& verifyInstanceofList((ArrayList<Object>) objectBalanceAsset, BalanceAsset.class)) {
54-
listBalanceAsset = BalanceFormatter.formatBalanceAssets((ArrayList<Object>) objectBalanceAsset);
53+
&& verifyInstanceofList((ArrayList<Object>) objectBalanceAsset, BalanceAssetGeneral.class)) {
54+
listBalanceAsset = BalanceFormatter.formatBalanceAssetsGeneral((ArrayList<Object>) objectBalanceAsset);
5555
}
5656

5757
return listBalanceAsset;

‎src/main/java/multichain/command/ChainCommand.java‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
/**
1313
* @author Ub - H. MARTEAU
14-
* @version 3.0
14+
* @version 4.13
1515
*/
1616
public class ChainCommand extends QueryBuilderChain {
1717

@@ -56,7 +56,27 @@ public ChainCommand(String ip, String port, String login, String password) {
5656
* @throws MultichainException
5757
*/
5858
public String getInfo() throws MultichainException {
59-
return executeGetInfo().toString();
59+
return executeGetInfo();
60+
}
61+
62+
/**
63+
* help ( command )
64+
*
65+
* List all commands, or get help for a specified command.
66+
*
67+
* Arguments:
68+
* 1. "command" (string, optional) The command to get help on
69+
*
70+
* Result:
71+
* "text" (string) The help text
72+
* @return
73+
* @throws MultichainException
74+
*/
75+
public String help() throws MultichainException {
76+
return executeHelp(null);
77+
}
78+
79+
public String help(String command) throws MultichainException {
80+
return executeHelp(command);
6081
}
61-
6282
}

‎src/main/java/multichain/command/MultichainException.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
/**
1111
* @author Ub - H. MARTEAU
12-
* @version 4.2
12+
* @version 4.13
1313
*/
1414
public class MultichainException extends Exception {
1515

@@ -25,6 +25,8 @@ public MultichainException(String excep_object, String excep_reason) {
2525
object = excep_object;
2626
reason = excep_reason;
2727
}
28+
29+
2830

2931
/*
3032
* (non-Javadoc)
@@ -34,7 +36,7 @@ public MultichainException(String excep_object, String excep_reason) {
3436
@Override
3537
public String toString() {
3638
return "MultichainException [\r\n" + " object=" + object + ",\r\n"
37-
+ " reason=" + reason + ",\r\n" + " message=" + getMessage()
39+
+ " reason=" + reason + ",\r\n" + " message=" + super.getMessage()
3840
+ ",\r\n" + " cause=" + getCause() + "\r\n]";
3941
}
4042

@@ -73,4 +75,14 @@ public void setReason(String reason) {
7375
this.reason = reason;
7476
}
7577

78+
79+
80+
/* (non-Javadoc)
81+
* @see java.lang.Throwable#getMessage()
82+
*/
83+
@Override
84+
public String getMessage() {
85+
return toString();
86+
}
87+
7688
}

‎src/main/java/multichain/command/RAWTransactionCommand.java‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package multichain.command;
99

1010
import java.util.List;
11+
import java.util.Map;
1112

1213
import multichain.command.builders.QueryBuilderRAWTransaction;
1314
import multichain.object.Address;
@@ -20,7 +21,7 @@
2021

2122
/**
2223
* @author Ub - H. MARTEAU
23-
* @version 4.10
24+
* @version 4.13
2425
*/
2526
public class RAWTransactionCommand extends QueryBuilderRAWTransaction {
2627

@@ -198,6 +199,22 @@ public SignedTransactionRAW createRawSendFrom(String address, List<RawParam> raw
198199

199200
return signedTransactionRAW;
200201
}
202+
203+
/**
204+
* to agree to call the method as in tutorial https://www.multichain.com/developers/raw-transactions/
205+
* for example have a look in test : RAWTransactionCommandTest
206+
*
207+
* @param address from-address
208+
* @param rawParams list of parameters
209+
* @return txId
210+
* @throws MultichainException
211+
*/
212+
public String createRawSendFromByMap(String address, List<Map<String, String>> rawParams)
213+
throws MultichainException {
214+
Object objectTransactionRAW = executeCreateRawSendFrom(address, rawParams);
215+
216+
return objectTransactionRAW.toString();
217+
}
201218

202219
/**
203220
* createrawsendfrom from-address {"address":amount,...} ( [data] action )

‎src/main/java/multichain/command/WalletTransactionCommand.java‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
package multichain.command;
99

1010
import java.util.ArrayList;
11-
import java.util.Arrays;
1211
import java.util.List;
1312

1413
import multichain.command.builders.QueryBuilderWalletTransaction;
15-
import multichain.object.BalanceAssetBase;
14+
import multichain.object.BalanceAssetGeneral;
1615
import multichain.object.Transaction;
1716
import multichain.object.TransactionWallet;
1817
import multichain.object.TransactionWalletDetailed;
@@ -23,7 +22,7 @@
2322

2423
/**
2524
* @author Ub - H. MARTEAU
26-
* @version 4.6
25+
* @version 4.13
2726
*/
2827
public class WalletTransactionCommand extends QueryBuilderWalletTransaction {
2928

@@ -270,7 +269,7 @@ public TransactionWalletDetailed getWalletTransactionWithDetail(String txid) thr
270269
* @throws MultichainException
271270
*/
272271
public TransactionWallet getWalletTransactionWithoutDetail(String txid) throws MultichainException {
273-
return getWalletTransaction(txid, false, false);
272+
return getWalletTransaction(txid, false, false).getTransactionWallet();
274273
}
275274

276275
/**
@@ -481,15 +480,11 @@ public List<TransactionWalletDetailed> listWalletTransaction(long count, long sk
481480
* @throws MultichainException
482481
*/
483482
public List<TransactionWallet> listWalletTransactionWithoutDetail(long count, long skip, boolean includeWatchonly, boolean verbose) throws MultichainException {
483+
List<TransactionWallet> listTransactionWallet = new ArrayList<TransactionWallet>();
484484

485-
List<TransactionWalletDetailed> listTransactionWalletDetailed = listWalletTransaction(count, skip, includeWatchonly, verbose);
486-
487-
TransactionWalletDetailed[] arrayTransactionWalletDetailed = new TransactionWalletDetailed[listTransactionWalletDetailed.size()];
488-
arrayTransactionWalletDetailed = listTransactionWalletDetailed.toArray(arrayTransactionWalletDetailed);
489-
490-
TransactionWallet[] arrayTransactionWallet = arrayTransactionWalletDetailed;
491-
List<TransactionWallet> listTransactionWallet = new ArrayList<>(Arrays.asList(arrayTransactionWallet));
492-
485+
Object objectTransactionWallet = executeListWalletTransaction(count, skip, includeWatchonly, verbose);
486+
listTransactionWallet = WalletTransactionFormatter.formatListTransactionWallet((List<Object>) objectTransactionWallet);
487+
493488
return listTransactionWallet;
494489
}
495490

@@ -569,7 +564,7 @@ public List<TransactionWallet> listWalletTransaction() throws MultichainExceptio
569564
* @return transactionId
570565
* @throws MultichainException
571566
*/
572-
public String sendFromAddress(String fromAddress, String toAddress, List<BalanceAssetBase> assets) throws MultichainException {
567+
public String sendFromAddress(String fromAddress, String toAddress, List<BalanceAssetGeneral> assets) throws MultichainException {
573568
String stringSendFromAddress = "";
574569

575570
Object objectSendFromAddress = executeSendFromAddress(fromAddress, toAddress, assets);
@@ -608,7 +603,7 @@ public String sendFromAddress(String fromAddress, String toAddress, List<Balance
608603
* @return
609604
* @throws MultichainException
610605
*/
611-
public String sendToAddress(String address, List<BalanceAssetBase> assets) throws MultichainException {
606+
public String sendToAddress(String address, List<BalanceAssetGeneral> assets) throws MultichainException {
612607
String stringSendToAddress = "";
613608

614609
Object objectSendToAddress = executeSendToAddress(address, assets);
@@ -680,7 +675,7 @@ public String sendToAddress(String address, double amount) throws MultichainExce
680675
* @return
681676
* @throws MultichainException
682677
*/
683-
public String sendWithMetaData(String address, List<BalanceAssetBase> assets, String hexMetaData) throws MultichainException {
678+
public String sendWithMetaData(String address, List<BalanceAssetGeneral> assets, String hexMetaData) throws MultichainException {
684679
String stringSendWithMetaData = "";
685680

686681
Object objectSendWithMetaData = executeSendWithMetaData(address, assets, hexMetaData);
@@ -751,7 +746,7 @@ public String sendWithMetaData(String address, double amount, String hexMetaData
751746
* @return
752747
* @throws MultichainException
753748
*/
754-
public String sendWithMetaDataFrom(String fromAddress, String toAddress, List<BalanceAssetBase> assets, String hexMetaData) throws MultichainException {
749+
public String sendWithMetaDataFrom(String fromAddress, String toAddress, List<BalanceAssetGeneral> assets, String hexMetaData) throws MultichainException {
755750
String stringSendWithMetaDataFrom = "";
756751

757752
Object objectSendWithMetaDataFrom = executeSendWithMetaDataFrom(fromAddress, toAddress, assets, hexMetaData);

‎src/main/java/multichain/command/builders/QueryBuilderChain.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,20 @@
1111

1212
/**
1313
* @author Ub - H. MARTEAU
14-
* @version 3.0
14+
* @version 4.13
1515
*/
1616
public class QueryBuilderChain extends QueryBuilderCommon {
1717

18-
protected Object executeGetInfo() throws MultichainException {
19-
return execute(CommandEnum.GETINFO);
18+
protected String executeGetInfo() throws MultichainException {
19+
return execute(CommandEnum.GETINFO).toString();
20+
}
21+
22+
protected String executeHelp(String arg) throws MultichainException {
23+
if(arg == null) {
24+
return (String) execute(CommandEnum.HELP);
25+
} else {
26+
return (String) execute(CommandEnum.HELP, arg);
27+
}
2028
}
2129

2230
}

‎src/main/java/multichain/command/builders/QueryBuilderIssue.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
/**
2020
* @author Ub - H. MARTEAU
21-
* @version 4.4
21+
* @version 4.13
2222
*/
2323
public class QueryBuilderIssue extends QueryBuilderCommon {
2424

@@ -382,7 +382,6 @@ protected Object executeIssueMoreFrom( String fromAddress,
382382
* @throws MultichainException
383383
*/
384384
protected Object executeListAssets(String asset, boolean verbose) throws MultichainException {
385-
MultichainTestParameter.isNotNullOrEmpty("asset", asset);
386385
if (asset != null && !"".equals(asset)) {
387386
return execute(CommandEnum.LISTASSETS, asset, verbose);
388387
} else {

0 commit comments

Comments
 (0)