Fix #155 ; Fix #153 ; Work on #95 ; Work on #76 ; Work on #5

Author: neutralleiter

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

@@ -20,13 +20,13 @@
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.google.common.annotations.VisibleForTesting;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import eu.bittrade.libs.steemj.base.models.operations.Operation;
 import eu.bittrade.libs.steemj.configuration.SteemJConfig;
 import eu.bittrade.libs.steemj.enums.PrivateKeyType;
+import eu.bittrade.libs.steemj.enums.ValidationType;
 import eu.bittrade.libs.steemj.exceptions.SteemInvalidTransactionException;
 import eu.bittrade.libs.steemj.interfaces.ByteTransformable;
 import eu.bittrade.libs.steemj.interfaces.SignatureObject;
@@ -106,17 +106,6 @@ public SignedTransaction(BlockId blockId, List<Operation> operations, List<Futur
         this.signatures = new ArrayList<>();
     }
 
-    /**
-     * <b>This method is only used by JUnit-Tests</b>
-     * 
-     * Create a new signed transaction object.
-     */
-    @VisibleForTesting
-    protected SignedTransaction() {
-        super();
-        this.signatures = new ArrayList<>();
-    }
-
     /**
      * Get the signatures for this transaction.
      * 
@@ -145,57 +134,28 @@ private boolean isCanonical(byte[] signature) {
 
     /**
      *
-     * Like {@link #sign(String) sign(String)}, but uses the default Steem chain
-     * id.
-     *
-     * @param skipValidation
-     *            Define if the validation should be skipped or not.
-     * @throws SteemInvalidTransactionException
-     *             If the transaction can not be signed.
-     */
-    @VisibleForTesting
-    protected void sign(boolean skipValidation) throws SteemInvalidTransactionException {
-        sign(SteemJConfig.getInstance().getChainId(), skipValidation);
-    }
-
-    /**
-     *
-     * Like {@link #sign(String) sign(String)}, but uses the default Steem chain
-     * id.
+     * Like {@link #sign(String) sign(String)}, but uses the
+     * {@link SteemJConfig#getChainId() default chain id}.
      *
      * @throws SteemInvalidTransactionException
      *             If the transaction can not be signed.
      */
     public void sign() throws SteemInvalidTransactionException {
-        sign(SteemJConfig.getInstance().getChainId(), false);
+        sign(SteemJConfig.getInstance().getChainId());
     }
 
     /**
      * Use this method if you want to specify a different chainId than the
-     * default one for STEEM. Otherwise use the {@link #sign() sign()} method.
+     * {@link SteemJConfig#getChainId() default one}. Otherwise use the
+     * {@link #sign() sign()} method.
      * 
      * @param chainId
      *            The chain id that should be used during signing.
      * @throws SteemInvalidTransactionException
      *             If the transaction can not be signed.
      */
     public void sign(String chainId) throws SteemInvalidTransactionException {
-        sign(chainId, false);
-    }
-
-    /**
-     * Use this method if you want to specify a different chainId than the
-     * default one for STEEM. Otherwise use the {@link #sign() sign()} method.
-     * 
-     * @param chainId
-     *            The chain id that should be used during signing.
-     * @param skipValidation
-     *            Define if the validation should be skipped or not.
-     * @throws SteemInvalidTransactionException
-     *             If the transaction can not be signed.
-     */
-    protected void sign(String chainId, boolean skipValidation) throws SteemInvalidTransactionException {
-        if (!skipValidation) {
+        if (!SteemJConfig.getInstance().getValidationLevel().equals(ValidationType.SKIP_VALIDATION)) {
             this.validate();
         }
 

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

@@ -24,14 +24,14 @@ public class GuestBloggerPairDeserializer extends JsonDeserializer<List<Pair<Acc
     public List<Pair<AccountName, Long>> deserialize(JsonParser jsonParser,
             DeserializationContext deserializationContext) throws IOException {
 
-        List<Pair<AccountName, Long>>  result = new ArrayList<>();
+        List<Pair<AccountName, Long>> result = new ArrayList<>();
 
         ObjectCodec codec = jsonParser.getCodec();
         TreeNode rootNode = codec.readTree(jsonParser);
 
         if (rootNode.isArray()) {
             for (JsonNode node : (ArrayNode) rootNode) {
-                //result.put((node.get(0)).asText(), (node.get(0)).asInt());
+                // result.put((node.get(0)).asText(), (node.get(0)).asInt());
             }
 
             return result;

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

@@ -61,11 +61,7 @@ public Asset getFee() {
      *             than 0.
      */
     public void setFee(Asset fee) {
-        if (fee == null) {
-            throw new InvalidParameterException("The fee can't be null.");
-        }
-
-        this.fee = fee;
+        this.fee = setIfNotNull(fee, "The fee can't be null.");
     }
 
     /**
@@ -87,11 +83,7 @@ public AccountName getCreator() {
      *             If the <code>creator</code> is null.
      */
     public void setCreator(AccountName creator) {
-        if (creator == null) {
-            throw new InvalidParameterException("The creator can't be null.");
-        }
-
-        this.creator = creator;
+        this.creator = setIfNotNull(creator, "The creator can't be null.");
     }
 
     /**
@@ -112,11 +104,7 @@ public AccountName getNewAccountName() {
      *             If the <code>newAccountName</code> is null.
      */
     public void setNewAccountName(AccountName newAccountName) {
-        if (newAccountName == null) {
-            throw new InvalidParameterException("The new account name can't be null.");
-        }
-
-        this.newAccountName = newAccountName;
+        this.newAccountName = setIfNotNull(newAccountName, "The new account name can't be null.");
     }
 
     /**
@@ -141,11 +129,7 @@ public Authority getOwner() {
      */
     @Override
     public void setOwner(Authority owner) {
-        if (owner == null) {
-            throw new InvalidParameterException("The owner can't be null.");
-        }
-
-        this.owner = owner;
+        this.owner = setIfNotNull(owner, "The owner can't be null.");
     }
 
     /**
@@ -170,11 +154,7 @@ public Authority getActive() {
      */
     @Override
     public void setActive(Authority active) {
-        if (active == null) {
-            throw new InvalidParameterException("The active can't be null.");
-        }
-
-        this.active = active;
+        this.active = setIfNotNull(active, "The active can't be null.");
     }
 
     /**
@@ -199,11 +179,7 @@ public Authority getPosting() {
      */
     @Override
     public void setPosting(Authority posting) {
-        if (posting == null) {
-            throw new InvalidParameterException("The posting can't be null.");
-        }
-
-        this.posting = posting;
+        this.posting = setIfNotNull(posting, "The posting can't be null.");
     }
 
     /**

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

@@ -58,11 +58,7 @@ public AccountName getFrom() {
      *             If the <code>from</code> is null.
      */
     public void setFrom(AccountName from) {
-        if (from == null) {
-            throw new InvalidParameterException("The from account can't be null.");
-        }
-
-        this.from = from;
+        this.from = setIfNotNull(from, "The from account can't be null.");
     }
 
     /**
@@ -83,11 +79,7 @@ public AccountName getTo() {
      *             If the <code>to</code> is null.
      */
     public void setTo(AccountName to) {
-        if (to == null) {
-            throw new InvalidParameterException("The to account can't be null.");
-        }
-
-        this.to = to;
+        this.to = setIfNotNull(to, "The to account can't be null.");
     }
 
     /**
@@ -108,11 +100,7 @@ public AccountName getAgent() {
      *             If the <code>agent</code> is null.
      */
     public void setAgent(AccountName agent) {
-        if (agent == null) {
-            throw new InvalidParameterException("The agent can't be null.");
-        }
-
-        this.agent = agent;
+        this.agent = setIfNotNull(agent, "The agent can't be null.");
     }
 
     /**

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

@@ -58,11 +58,7 @@ public AccountName getFrom() {
      *             If the <code>from</code> account is null.
      */
     public void setFrom(AccountName from) {
-        if (from == null) {
-            throw new InvalidParameterException("The from account can't be null.");
-        }
-
-        this.from = from;
+        this.from = setIfNotNull(from, "The from account can't be null.");
     }
 
     /**
@@ -86,11 +82,7 @@ public AccountName getTo() {
      *             If the <code>to</code> account is null.
      */
     public void setTo(AccountName to) {
-        if (to == null) {
-            throw new InvalidParameterException("The to account can't be null.");
-        }
-
-        this.to = to;
+        this.to = setIfNotNull(to, "The to account can't be null.");
     }
 
     /**
@@ -111,11 +103,7 @@ public Asset getAmount() {
      *             If the <code>amount</code> is null.
      */
     public void setAmount(Asset amount) {
-        if (amount == null) {
-            throw new InvalidParameterException("The amount can't be null.");
-        }
-
-        this.amount = amount;
+        this.amount = setIfNotNull(amount, "The amount can't be null.");
     }
 
     @Override

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

@@ -75,8 +75,8 @@ public AccountCreateOperation(@JsonProperty("creator") AccountName creator, @Jso
     @Override
     public byte[] toByteArray() throws SteemInvalidTransactionException {
         try (ByteArrayOutputStream serializedAccountCreateOperation = new ByteArrayOutputStream()) {
-            serializedAccountCreateOperation
-                    .write(SteemJUtils.transformIntToVarIntByteArray(OperationType.ACCOUNT_CREATE_OPERATION.ordinal()));
+            serializedAccountCreateOperation.write(
+                    SteemJUtils.transformIntToVarIntByteArray(OperationType.ACCOUNT_CREATE_OPERATION.getOrderId()));
             serializedAccountCreateOperation.write(this.getFee().toByteArray());
             serializedAccountCreateOperation.write(this.getCreator().toByteArray());
             serializedAccountCreateOperation.write(this.getNewAccountName().toByteArray());

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

@@ -117,11 +117,7 @@ public Asset getDelegation() {
      *             than 0.
      */
     public void setDelegation(Asset delegation) {
-        if (delegation == null) {
-            throw new InvalidParameterException("The delegation can't be null.");
-        }
-
-        this.delegation = delegation;
+        this.delegation = setIfNotNull(delegation, "The delegation can't be null.");
     }
 
     /**
@@ -150,8 +146,8 @@ public void setExtensions(List<FutureExtensions> extensions) {
     @Override
     public byte[] toByteArray() throws SteemInvalidTransactionException {
         try (ByteArrayOutputStream serializedAccountCreateWithDelegationOperation = new ByteArrayOutputStream()) {
-            serializedAccountCreateWithDelegationOperation.write(SteemJUtils
-                    .transformIntToVarIntByteArray(OperationType.ACCOUNT_CREATE_WITH_DELEGATION_OPERATION.ordinal()));
+            serializedAccountCreateWithDelegationOperation.write(SteemJUtils.transformIntToVarIntByteArray(
+                    OperationType.ACCOUNT_CREATE_WITH_DELEGATION_OPERATION.getOrderId()));
             serializedAccountCreateWithDelegationOperation.write(this.getFee().toByteArray());
             serializedAccountCreateWithDelegationOperation.write(this.getDelegation().toByteArray());
             serializedAccountCreateWithDelegationOperation.write(this.getCreator().toByteArray());

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

@@ -178,18 +178,14 @@ public AccountName getAccount() {
      *             If the <code>account</code> is null.
      */
     public void setAccount(AccountName account) {
-        if (account == null) {
-            throw new InvalidParameterException("The account can't be null.");
-        }
-
-        this.account = account;
+        this.account = setIfNotNull(account, "The account can't be null.");
     }
 
     @Override
     public byte[] toByteArray() throws SteemInvalidTransactionException {
         try (ByteArrayOutputStream serializedAccountUpdateOperation = new ByteArrayOutputStream()) {
-            serializedAccountUpdateOperation
-                    .write(SteemJUtils.transformIntToVarIntByteArray(OperationType.ACCOUNT_UPDATE_OPERATION.ordinal()));
+            serializedAccountUpdateOperation.write(
+                    SteemJUtils.transformIntToVarIntByteArray(OperationType.ACCOUNT_UPDATE_OPERATION.getOrderId()));
             serializedAccountUpdateOperation.write(this.getAccount().toByteArray());
 
             // Handle optional values.

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

@@ -71,11 +71,7 @@ public AccountName getAccount() {
      *             been configured as the proxy.
      */
     public void setAccount(AccountName account) {
-        if (account == null) {
-            throw new InvalidParameterException("The account can't be null.");
-        }
-
-        this.account = account;
+        this.account = setIfNotNull(account, "The account can't be null.");
     }
 
     /**
@@ -108,8 +104,8 @@ public void setProxy(AccountName proxy) {
     @Override
     public byte[] toByteArray() throws SteemInvalidTransactionException {
         try (ByteArrayOutputStream serializedAccountWitnessProxyOperation = new ByteArrayOutputStream()) {
-            serializedAccountWitnessProxyOperation.write(
-                    SteemJUtils.transformIntToVarIntByteArray(OperationType.ACCOUNT_WITNESS_PROXY_OPERATION.ordinal()));
+            serializedAccountWitnessProxyOperation.write(SteemJUtils
+                    .transformIntToVarIntByteArray(OperationType.ACCOUNT_WITNESS_PROXY_OPERATION.getOrderId()));
             serializedAccountWitnessProxyOperation.write(this.getAccount().toByteArray());
             serializedAccountWitnessProxyOperation.write(this.getProxy().toByteArray());
 

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

@@ -98,11 +98,7 @@ public AccountName getAccount() {
      *             If the <code>account</code> account is null
      */
     public void setAccount(AccountName account) {
-        if (account == null) {
-            throw new InvalidParameterException("The witness acccount can't be null.");
-        }
-
-        this.account = account;
+        this.account = setIfNotNull(account, "The witness acccount can't be null.");
     }
 
     /**
@@ -123,11 +119,7 @@ public AccountName getWitness() {
      *             If the <code>witness</code> account is null
      */
     public void setWitness(AccountName witness) {
-        if (witness == null) {
-            throw new InvalidParameterException("The witness acccount can't be null.");
-        }
-
-        this.witness = witness;
+        this.witness = setIfNotNull(witness, "The witness acccount can't be null.");
     }
 
     /**
@@ -152,8 +144,8 @@ public void setApprove(boolean approve) {
     @Override
     public byte[] toByteArray() throws SteemInvalidTransactionException {
         try (ByteArrayOutputStream serializedAccountWitnessVoteOperation = new ByteArrayOutputStream()) {
-            serializedAccountWitnessVoteOperation.write(
-                    SteemJUtils.transformIntToVarIntByteArray(OperationType.ACCOUNT_WITNESS_VOTE_OPERATION.ordinal()));
+            serializedAccountWitnessVoteOperation.write(SteemJUtils
+                    .transformIntToVarIntByteArray(OperationType.ACCOUNT_WITNESS_VOTE_OPERATION.getOrderId()));
             serializedAccountWitnessVoteOperation.write(this.getAccount().toByteArray());
             serializedAccountWitnessVoteOperation.write(this.getWitness().toByteArray());
             serializedAccountWitnessVoteOperation.write(SteemJUtils.transformBooleanToByteArray(this.getApprove()));