Fix #164 and #163

Author: neutralleiter

core/src/main/java/eu/bittrade/libs/steemj/SteemJ.java

@@ -3636,11 +3636,12 @@ public void deletePostOrComment(AccountName postOrCommentAuthor, Permlink postOr
     }
 
     /**
-     * Transfer currency from default account to recipient. Amount is
-     * automatically converted from normalized representation to base
+     * Transfer the currency of your choice from
+     * {@link SteemJConfig#getDefaultAccount() DefaultAccount} to recipient.
+     * Amount is automatically converted from normalized representation to base
      * representation. For example, to transfer 1.00 SBD to another account,
      * simply use:
-     * <code>SteemJ.transfer(new AccountName("accountb"), AssetSymbolType.SBD, 1.0, "My memo");</code>
+     * <code>SteemJ.transfer(new AccountName("accountb"), new Asset(1.0, AssetSymbolType.SBD), "My memo");</code>
      *
      * <b>Attention</b>
      * <ul>
@@ -3655,20 +3656,18 @@ public void deletePostOrComment(AccountName postOrCommentAuthor, Permlink postOr
      * transfer from. If no default account has been provided, this method will
      * throw an error. If you do not want to configure the following account as
      * a default account, please use the
-     * {@link #transfer(AccountName, AccountName, AssetSymbolType, double, String)}
-     * method and provide the <code>from</code> account separately.</li>
+     * {@link #transfer(AccountName, AccountName, Asset, String)} method and
+     * provide the <code>from</code> account separately.</li>
      * </ul>
      *
      * @param to
      *            The account name of the account the
      *            {@link SteemJConfig#getDefaultAccount() DefaultAccount} should
      *            transfer currency to.
-     * @param assetType
-     *            Asset type, see
-     *            {@link eu.bittrade.libs.steemj.enums.AssetSymbolType}.
      * @param amount
-     *            Normalized amount of asset to transfer. For example, use 1.0
-     *            to transfer 1 SBD.
+     *            An {@link Asset} object containing the Asset type (see
+     *            {@link eu.bittrade.libs.steemj.enums.AssetSymbolType} and the
+     *            amount to transfer.
      * @param memo
      *            Message include with transfer (255 char max)
      * @return The TransferOperation broadcast.
@@ -3692,13 +3691,13 @@ public void deletePostOrComment(AccountName postOrCommentAuthor, Permlink postOr
      *             If one of the provided parameters does not fulfill the
      *             requirements described above.
      */
-    public TransferOperation transfer(AccountName to, AssetSymbolType assetType, double amount, String memo)
+    public TransferOperation transfer(AccountName to, Asset amount, String memo)
             throws SteemCommunicationException, SteemResponseException, SteemInvalidTransactionException {
         if (SteemJConfig.getInstance().getDefaultAccount().isEmpty()) {
             throw new InvalidParameterException(NO_DEFAULT_ACCOUNT_ERROR_MESSAGE);
         }
 
-        return transfer(SteemJConfig.getInstance().getDefaultAccount(), to, assetType, amount, memo);
+        return transfer(SteemJConfig.getInstance().getDefaultAccount(), to, amount, memo);
     }
 
     /**
@@ -3719,11 +3718,10 @@ public TransferOperation transfer(AccountName to, AssetSymbolType assetType, dou
      *            The account from which to transfer currency.
      * @param to
      *            The account to which to transfer currency.
-     * @param assetType
-     *            Asset type, see
-     *            {@link eu.bittrade.libs.steemj.enums.AssetSymbolType}.
      * @param amount
-     *            The amount to transfer.
+     *            An {@link Asset} object containing the Asset type (see
+     *            {@link eu.bittrade.libs.steemj.enums.AssetSymbolType} and the
+     *            amount to transfer.
      * @param memo
      *            Message include with transfer (255 char max)
      * @return The TransferOperation broadcast.
@@ -3747,19 +3745,9 @@ public TransferOperation transfer(AccountName to, AssetSymbolType assetType, dou
      *             If one of the provided parameters does not fulfill the
      *             requirements described above.
      */
-    public TransferOperation transfer(AccountName from, AccountName to, AssetSymbolType assetType, double amount,
-            String memo) throws SteemCommunicationException, SteemResponseException, SteemInvalidTransactionException {
-        // Convert amount to long asset value. Conversion factor depends on
-        // asset type
-        Asset asset = new Asset();
-        asset.setSymbol(assetType);
-        asset.setAmount(Double.valueOf(amount * Math.pow(10.0, asset.getPrecision())).longValue());
-        if (!asset.toReal().equals(amount)) {
-            throw new IllegalStateException("Amount conversion mismatch: " + amount + " -> " + asset.toReal());
-        }
-
-        // Create & broadcast transfer operation
-        TransferOperation transferOperation = new TransferOperation(from, to, asset, memo);
+    public TransferOperation transfer(AccountName from, AccountName to, Asset amount, String memo)
+            throws SteemCommunicationException, SteemResponseException, SteemInvalidTransactionException {
+        TransferOperation transferOperation = new TransferOperation(from, to, amount, memo);
         ArrayList<Operation> operations = new ArrayList<>();
         operations.add(transferOperation);
         DynamicGlobalProperty globalProperties = this.getDynamicGlobalProperties();

core/src/main/java/eu/bittrade/libs/steemj/base/models/Asset.java

@@ -33,10 +33,18 @@ public class Asset implements ByteTransformable {
     private byte precision;
 
     /**
-     * Create an empty Asset object.
+     * Create a new asset object by providing all required fields.
+     * 
+     * @param amount
+     *            The amount.
+     * @param symbol
+     *            One type of
+     *            {@link eu.bittrade.libs.steemj.enums.AssetSymbolType
+     *            AssetSymbolType}.
      */
-    public Asset() {
-
+    public Asset(double amount, AssetSymbolType symbol) {
+        this.setSymbol(symbol);
+        this.setAmount(amount);
     }
 
     /**
@@ -50,8 +58,8 @@ public Asset() {
      *            AssetSymbolType}.
      */
     public Asset(long amount, AssetSymbolType symbol) {
-        this.setAmount(amount);
         this.setSymbol(symbol);
+        this.setAmount(amount);
     }
 
     /**
@@ -92,6 +100,16 @@ public void setAmount(long amount) {
         this.amount = amount;
     }
 
+    /**
+     * Set the amount of this asset.
+     * 
+     * @param amount
+     *            The amount.
+     */
+    public void setAmount(double amount) {
+        this.amount = (long) (amount * Math.pow(10.0, this.getPrecision()));
+    }
+
     /**
      * Set the symbol of this asset.
      * 

core/src/main/java/eu/bittrade/libs/steemj/base/models/deserializer/AssetDeserializer.java

@@ -21,16 +21,15 @@ public Asset deserialize(JsonParser jasonParser, DeserializationContext deserial
             String[] assetFields = jasonParser.getText().split(" ");
 
             if (assetFields.length == 2) {
-                Asset asset = new Asset();
-                // Set the symbol first which calculates the precision
-                // internally.
-                asset.setSymbol(AssetSymbolType.valueOf(assetFields[1]));
-                // The amount is provided as a double value while we need a long
-                // value for the byte representation so we transform the amount
-                // into a long value here.
-                Double assetAmount = Double.valueOf(assetFields[0]) * Math.pow(10.0, asset.getPrecision());
-                asset.setAmount(assetAmount.longValue());
-                return asset;
+                /*
+                 * Set the symbol first which calculates the precision
+                 * internally.
+                 *
+                 * The amount is provided as a double value while we need a long
+                 * value for the byte representation so we transform the amount
+                 * into a long value here.
+                 */
+                return new Asset(Double.valueOf(assetFields[0]), AssetSymbolType.valueOf(assetFields[1]));
             }
         }
 

core/src/test/java/eu/bittrade/libs/steemj/SteemJIT.java

@@ -461,9 +461,7 @@ public void testVerifyAuthority() throws Exception {
 
         config.getPrivateKeyStorage().addAccount(new AccountName("dez1337"), privateKeys);
 
-        Asset steemAmount = new Asset();
-        steemAmount.setAmount(1L);
-        steemAmount.setSymbol(AssetSymbolType.STEEM);
+        Asset steemAmount = new Asset(1L, AssetSymbolType.STEEM);
 
         AccountName from = new AccountName("dez1337");
         AccountName to = new AccountName("steemj");

core/src/test/java/eu/bittrade/libs/steemj/base/models/AssetTest.java

@@ -34,9 +34,7 @@ public class AssetTest {
      */
     @Test
     public void testVestsAssetToByteArray() throws Exception {
-        Asset vestsAsset = new Asset();
-        vestsAsset.setSymbol(AssetSymbolType.VESTS);
-        vestsAsset.setAmount(1230);
+        Asset vestsAsset = new Asset(1230, AssetSymbolType.VESTS);
 
         assertThat(vestsAsset.getPrecision(), equalTo(6));
         assertThat("Expect that the asset object has the given byte representation.",
@@ -52,9 +50,7 @@ public void testVestsAssetToByteArray() throws Exception {
      */
     @Test
     public void testSteemAssetToByteArray() throws Exception {
-        Asset steemAsset = new Asset();
-        steemAsset.setSymbol(AssetSymbolType.STEEM);
-        steemAsset.setAmount(123000);
+        Asset steemAsset = new Asset(123000, AssetSymbolType.STEEM);
 
         assertThat(steemAsset.getPrecision(), equalTo(3));
         assertThat("Expect that the asset object has the given byte representation.",
@@ -70,9 +66,7 @@ public void testSteemAssetToByteArray() throws Exception {
      */
     @Test
     public void testSbdAssetToByteArray() throws Exception {
-        Asset sbdAsset = new Asset();
-        sbdAsset.setSymbol(AssetSymbolType.SBD);
-        sbdAsset.setAmount(123);
+        Asset sbdAsset = new Asset(123, AssetSymbolType.SBD);
 
         assertThat(sbdAsset.getPrecision(), equalTo(3));
         assertThat("Expect that the asset object has the given byte representation.",
@@ -88,9 +82,7 @@ public void testSbdAssetToByteArray() throws Exception {
      */
     @Test
     public void testStmdAssetToByteArray() throws Exception {
-        Asset sbdAsset = new Asset();
-        sbdAsset.setSymbol(AssetSymbolType.STMD);
-        sbdAsset.setAmount(56844);
+        Asset sbdAsset = new Asset(56844, AssetSymbolType.STMD);
 
         assertThat(sbdAsset.getPrecision(), equalTo(3));
         assertThat("Expect that the asset object has the given byte representation.",
@@ -106,9 +98,7 @@ public void testStmdAssetToByteArray() throws Exception {
      */
     @Test
     public void testTestsAssetToByteArray() throws Exception {
-        Asset sbdAsset = new Asset();
-        sbdAsset.setSymbol(AssetSymbolType.TESTS);
-        sbdAsset.setAmount(36741);
+        Asset sbdAsset = new Asset(36741, AssetSymbolType.TESTS);
 
         assertThat(sbdAsset.getPrecision(), equalTo(3));
         assertThat("Expect that the asset object has the given byte representation.",
@@ -124,9 +114,7 @@ public void testTestsAssetToByteArray() throws Exception {
      */
     @Test
     public void testTbdAssetToByteArray() throws Exception {
-        Asset sbdAsset = new Asset();
-        sbdAsset.setSymbol(AssetSymbolType.TBD);
-        sbdAsset.setAmount(4547);
+        Asset sbdAsset = new Asset(4547, AssetSymbolType.TBD);
 
         assertThat(sbdAsset.getPrecision(), equalTo(3));
         assertThat("Expect that the asset object has the given byte representation.",
@@ -142,9 +130,7 @@ public void testTbdAssetToByteArray() throws Exception {
      */
     @Test
     public void testTstdAssetToByteArray() throws Exception {
-        Asset sbdAsset = new Asset();
-        sbdAsset.setSymbol(AssetSymbolType.TSTD);
-        sbdAsset.setAmount(78945214);
+        Asset sbdAsset = new Asset(78945214, AssetSymbolType.TSTD);
 
         assertThat(sbdAsset.getPrecision(), equalTo(3));
         assertThat("Expect that the asset object has the given byte representation.",
@@ -157,18 +143,11 @@ public void testTstdAssetToByteArray() throws Exception {
      */
     @Test
     public void testAssetEqualsMethod() {
+        Asset asset = new Asset(115, AssetSymbolType.SBD);
 
-        Asset asset = new Asset();
-        asset.setAmount(115);
-        asset.setSymbol(AssetSymbolType.SBD);
+        Asset sameAsset = new Asset(0.115, AssetSymbolType.SBD);
 
-        Asset sameAsset = new Asset();
-        sameAsset.setAmount(115);
-        sameAsset.setSymbol(AssetSymbolType.SBD);
-
-        Asset differentAsset = new Asset();
-        differentAsset.setAmount(100);
-        differentAsset.setSymbol(AssetSymbolType.STEEM);
+        Asset differentAsset = new Asset(100, AssetSymbolType.STEEM);
 
         assertThat(asset.equals(sameAsset), equalTo(true));
         assertThat(sameAsset.equals(differentAsset), equalTo(false));

core/src/test/java/eu/bittrade/libs/steemj/base/models/ChainPropertiesTest.java

@@ -26,9 +26,7 @@ public class ChainPropertiesTest {
      */
     @Test
     public void testSteemChainPropertiesToByteArray() throws Exception {
-        Asset accountCreationFee = new Asset();
-        accountCreationFee.setAmount(5000);
-        accountCreationFee.setSymbol(AssetSymbolType.STEEM);
+        Asset accountCreationFee = new Asset(5000, AssetSymbolType.STEEM);
 
         long maximumBlockSize = 65536;
         int sbdInterestRate = 0;
@@ -46,9 +44,7 @@ public void testSteemChainPropertiesToByteArray() throws Exception {
      */
     @Test(expected = InvalidParameterException.class)
     public void testChainPropertiesValidationInterestRate() {
-        Asset accountCreationFee = new Asset();
-        accountCreationFee.setAmount(5000);
-        accountCreationFee.setSymbol(AssetSymbolType.STEEM);
+        Asset accountCreationFee = new Asset(5000, AssetSymbolType.STEEM);
 
         long maximumBlockSize = 65570;
         int sbdInterestRate = -1;
@@ -62,9 +58,7 @@ public void testChainPropertiesValidationInterestRate() {
      */
     @Test(expected = InvalidParameterException.class)
     public void testChainPropertiesValidationBlockSize() {
-        Asset accountCreationFee = new Asset();
-        accountCreationFee.setAmount(5000);
-        accountCreationFee.setSymbol(AssetSymbolType.STEEM);
+        Asset accountCreationFee = new Asset(5000, AssetSymbolType.STEEM);
 
         long maximumBlockSize = 5215;
         int sbdInterestRate = 0;
@@ -78,9 +72,7 @@ public void testChainPropertiesValidationBlockSize() {
      */
     @Test(expected = InvalidParameterException.class)
     public void testChainPropertiesValidationAccountCreationFee() {
-        Asset accountCreationFee = new Asset();
-        accountCreationFee.setAmount(-1);
-        accountCreationFee.setSymbol(AssetSymbolType.STEEM);
+        Asset accountCreationFee = new Asset(5000, AssetSymbolType.STEEM);
 
         long maximumBlockSize = 65535;
         int sbdInterestRate = 5;
@@ -99,9 +91,7 @@ public void testChainPropertiesValidation() {
         new AccountName("dez");
         new AccountName("dez1337-steemj");
 
-        Asset accountCreationFee = new Asset();
-        accountCreationFee.setAmount(3);
-        accountCreationFee.setSymbol(AssetSymbolType.STEEM);
+        Asset accountCreationFee = new Asset(3, AssetSymbolType.STEEM);
 
         long maximumBlockSize = 65536;
         int sbdInterestRate = 5;