Change package structure and integrate the NetworkBroadcastApi into the SteemJ class (Work on #76)

Author: neutralleiter

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

@@ -65,6 +65,7 @@
 import eu.bittrade.libs.steemj.base.models.PublicKey;
 import eu.bittrade.libs.steemj.base.models.RewardFund;
 import eu.bittrade.libs.steemj.base.models.ScheduledHardfork;
+import eu.bittrade.libs.steemj.base.models.SignedBlock;
 import eu.bittrade.libs.steemj.base.models.SignedBlockWithInfo;
 import eu.bittrade.libs.steemj.base.models.SignedTransaction;
 import eu.bittrade.libs.steemj.base.models.Tag;
@@ -96,6 +97,8 @@
 import eu.bittrade.libs.steemj.exceptions.SteemInvalidTransactionException;
 import eu.bittrade.libs.steemj.exceptions.SteemResponseException;
 import eu.bittrade.libs.steemj.exceptions.SteemTransformationException;
+import eu.bittrade.libs.steemj.plugins.network.broadcast.api.NetworkBroadcastApi;
+import eu.bittrade.libs.steemj.plugins.network.broadcast.model.BroadcastTransactionSynchronousReturn;
 import eu.bittrade.libs.steemj.util.CondenserUtils;
 import eu.bittrade.libs.steemj.util.SteemJUtils;
 
@@ -163,10 +166,14 @@ public SteemJ() throws SteemCommunicationException, SteemResponseException {
     // #########################################################################
 
     /**
-     * Broadcast a transaction on the Steem blockchain.
+     * Broadcast a transaction on the Steem blockchain. This method will
+     * validate the transaction and return immediately. Please notice that this
+     * does not mean that the operation has been accepted and has been
+     * processed. If you want to make sure that this is the case use the
+     * {@link #broadcastTransactionSynchronous(SignedTransaction)} method.
      * 
      * @param transaction
-     *            A transaction object that has been signed.
+     *            The {@link SignedTransaction} object to broadcast.
      * @throws SteemCommunicationException
      *             <ul>
      *             <li>If the server was not able to answer the request in the
@@ -181,17 +188,68 @@ public SteemJ() throws SteemCommunicationException, SteemResponseException {
      *             into a Java object.</li>
      *             <li>If the Server returned an error object.</li>
      *             </ul>
+     * @throws SteemInvalidTransactionException
+     *             In case the provided transaction is not valid.
      */
     public void broadcastTransaction(SignedTransaction transaction)
-            throws SteemCommunicationException, SteemResponseException {
-        JsonRPCRequest requestObject = new JsonRPCRequest();
-        requestObject.setApiMethod(RequestMethods.BROADCAST_TRANSACTION);
-        requestObject.setSteemApi(SteemApiType.NETWORK_BROADCAST_API);
+            throws SteemCommunicationException, SteemResponseException, SteemInvalidTransactionException {
+        NetworkBroadcastApi.broadcastTransaction(communicationHandler, transaction);
+    }
 
-        Object[] parameters = { transaction };
-        requestObject.setAdditionalParameters(parameters);
+    /**
+     * Broadcast a transaction on the Steem blockchain. This method will
+     * validate the transaction and return after it has been accepted and
+     * applied.
+     * 
+     * @param transaction
+     *            The {@link SignedTransaction} object to broadcast.
+     * @return A {@link BroadcastTransactionSynchronousReturn} object providing
+     *         information about the block in which the transaction has been
+     *         applied.
+     * @throws SteemCommunicationException
+     *             <ul>
+     *             <li>If the server was not able to answer the request in the
+     *             given time (see
+     *             {@link eu.bittrade.libs.steemj.configuration.SteemJConfig#setResponseTimeout(int)
+     *             setResponseTimeout}).</li>
+     *             <li>If there is a connection problem.</li>
+     *             </ul>
+     * @throws SteemResponseException
+     *             <ul>
+     *             <li>If the SteemJ is unable to transform the JSON response
+     *             into a Java object.</li>
+     *             <li>If the Server returned an error object.</li>
+     *             </ul>
+     * @throws SteemInvalidTransactionException
+     *             In case the provided transaction is not valid.
+     */
+    public BroadcastTransactionSynchronousReturn broadcastTransactionSynchronous(SignedTransaction transaction)
+            throws SteemCommunicationException, SteemResponseException, SteemInvalidTransactionException {
+        return NetworkBroadcastApi.broadcastTransactionSynchronous(communicationHandler, transaction);
+    }
 
-        communicationHandler.performRequest(requestObject, Object.class);
+    /**
+     * Broadcast a whole block.
+     * 
+     * @param signedBlock
+     *            The {@link SignedBlock} object to broadcast.
+     * @throws SteemCommunicationException
+     *             <ul>
+     *             <li>If the server was not able to answer the request in the
+     *             given time (see
+     *             {@link eu.bittrade.libs.steemj.configuration.SteemJConfig#setResponseTimeout(int)
+     *             setResponseTimeout}).</li>
+     *             <li>If there is a connection problem.</li>
+     *             </ul>
+     * @throws SteemResponseException
+     *             <ul>
+     *             <li>If the SteemJ is unable to transform the JSON response
+     *             into a Java object.</li>
+     *             <li>If the Server returned an error object.</li>
+     *             </ul>
+     */
+    public void broadcastBlock(SignedBlock signedBlock) throws SteemCommunicationException, SteemResponseException {
+        NetworkBroadcastApi.broadcastBlock(communicationHandler, signedBlock);
     }
 
     // #########################################################################

…twork/broadcast/NetworkBroadcastApi.java …k/broadcast/api/NetworkBroadcastApi.javacore/src/main/java/eu/bittrade/libs/steemj/apis/network/broadcast/NetworkBroadcastApi.java renamed to core/src/main/java/eu/bittrade/libs/steemj/plugins/network/broadcast/api/NetworkBroadcastApi.java core/src/main/java/eu/bittrade/libs/steemj/apis/network/broadcast/NetworkBroadcastApi.java renamed to core/src/main/java/eu/bittrade/libs/steemj/plugins/network/broadcast/api/NetworkBroadcastApi.java

@@ -1,6 +1,5 @@
-package eu.bittrade.libs.steemj.apis.network.broadcast;
+package eu.bittrade.libs.steemj.plugins.network.broadcast.api;
 
-import eu.bittrade.libs.steemj.apis.network.broadcast.model.BroadcastTransactionSynchronousReturn;
 import eu.bittrade.libs.steemj.base.models.SignedBlock;
 import eu.bittrade.libs.steemj.base.models.SignedTransaction;
 import eu.bittrade.libs.steemj.communication.CommunicationHandler;
@@ -10,6 +9,7 @@
 import eu.bittrade.libs.steemj.exceptions.SteemCommunicationException;
 import eu.bittrade.libs.steemj.exceptions.SteemInvalidTransactionException;
 import eu.bittrade.libs.steemj.exceptions.SteemResponseException;
+import eu.bittrade.libs.steemj.plugins.network.broadcast.model.BroadcastTransactionSynchronousReturn;
 
 /**
  * This class implements the network broadcast api which is required to send

…oadcastTransactionSynchronousReturn.java …oadcastTransactionSynchronousReturn.javacore/src/main/java/eu/bittrade/libs/steemj/apis/network/broadcast/model/BroadcastTransactionSynchronousReturn.java renamed to core/src/main/java/eu/bittrade/libs/steemj/plugins/network/broadcast/model/BroadcastTransactionSynchronousReturn.java core/src/main/java/eu/bittrade/libs/steemj/apis/network/broadcast/model/BroadcastTransactionSynchronousReturn.java renamed to core/src/main/java/eu/bittrade/libs/steemj/plugins/network/broadcast/model/BroadcastTransactionSynchronousReturn.java

@@ -1,4 +1,4 @@
-package eu.bittrade.libs.steemj.apis.network.broadcast.model;
+package eu.bittrade.libs.steemj.plugins.network.broadcast.model;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 

…ork/broadcast/NetworkBroadcastApiIT.java …broadcast/api/NetworkBroadcastApiIT.javacore/src/test/java/eu/bittrade/libs/steemj/apis/network/broadcast/NetworkBroadcastApiIT.java renamed to core/src/test/java/eu/bittrade/libs/steemj/plugins/network/broadcast/api/NetworkBroadcastApiIT.java core/src/test/java/eu/bittrade/libs/steemj/apis/network/broadcast/NetworkBroadcastApiIT.java renamed to core/src/test/java/eu/bittrade/libs/steemj/plugins/network/broadcast/api/NetworkBroadcastApiIT.java

@@ -1,4 +1,4 @@
-package eu.bittrade.libs.steemj.apis.network.broadcast;
+package eu.bittrade.libs.steemj.plugins.network.broadcast.api;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThan;
@@ -19,7 +19,6 @@
 import eu.bittrade.libs.steemj.IntegrationTest;
 import eu.bittrade.libs.steemj.apis.follow.enums.FollowType;
 import eu.bittrade.libs.steemj.apis.follow.models.operations.FollowOperation;
-import eu.bittrade.libs.steemj.apis.network.broadcast.model.BroadcastTransactionSynchronousReturn;
 import eu.bittrade.libs.steemj.base.models.AccountName;
 import eu.bittrade.libs.steemj.base.models.DynamicGlobalProperty;
 import eu.bittrade.libs.steemj.base.models.SignedTransaction;
@@ -29,10 +28,12 @@
 import eu.bittrade.libs.steemj.exceptions.SteemCommunicationException;
 import eu.bittrade.libs.steemj.exceptions.SteemInvalidTransactionException;
 import eu.bittrade.libs.steemj.exceptions.SteemResponseException;
+import eu.bittrade.libs.steemj.plugins.network.broadcast.api.NetworkBroadcastApi;
+import eu.bittrade.libs.steemj.plugins.network.broadcast.model.BroadcastTransactionSynchronousReturn;
 
 /**
  * This class contains all test connected to the
- * {@link eu.bittrade.libs.steemj.apis.network.broadcast.NetworkBroadcastApi
+ * {@link eu.bittrade.libs.steemj.plugins.network.broadcast.api.NetworkBroadcastApi
  * NetworkBroadcastApi}.
  * 
  * @author <a href="http://steemit.com/@dez1337">dez1337</a>
@@ -55,7 +56,7 @@ public static void init() throws SteemCommunicationException {
 
     /**
      * Test the
-     * {@link eu.bittrade.libs.steemj.apis.network.broadcast.NetworkBroadcastApi#broadcastTransactionSynchronous(CommunicationHandler, eu.bittrade.libs.steemj.base.models.SignedTransaction)}
+     * {@link eu.bittrade.libs.steemj.plugins.network.broadcast.api.NetworkBroadcastApi#broadcastTransactionSynchronous(CommunicationHandler, eu.bittrade.libs.steemj.base.models.SignedTransaction)}
      * method.
      * 
      * @throws SteemCommunicationException
@@ -98,7 +99,7 @@ public void testBroadcastTransactionSynchronous()
 
     /**
      * Test the
-     * {@link eu.bittrade.libs.steemj.apis.network.broadcast.NetworkBroadcastApi#broadcastTransaction(CommunicationHandler, eu.bittrade.libs.steemj.base.models.SignedTransaction)}
+     * {@link eu.bittrade.libs.steemj.plugins.network.broadcast.api.NetworkBroadcastApi#broadcastTransaction(CommunicationHandler, eu.bittrade.libs.steemj.base.models.SignedTransaction)}
      * method.
      * 
      * @throws SteemCommunicationException
@@ -135,7 +136,7 @@ public void testBroadcastTransaction()
 
     /**
      * Test the
-     * {@link eu.bittrade.libs.steemj.apis.network.broadcast.NetworkBroadcastApi#broadcastBlock(CommunicationHandler, eu.bittrade.libs.steemj.base.models.SignedBlock)}
+     * {@link eu.bittrade.libs.steemj.plugins.network.broadcast.api.NetworkBroadcastApi#broadcastBlock(CommunicationHandler, eu.bittrade.libs.steemj.base.models.SignedBlock)}
      * method.
      * 
      * @throws SteemCommunicationException