Merge pull request #3 from authenteq/master

Update from authenteq

Author: agwego

.travis.yml

@@ -4,6 +4,9 @@ jdk:
  - oraclejdk8
 install: true
 
+before_script:
+ - mvn install:install-file -Dfile=$TRAVIS_BUILD_DIR/libs/java-crypto-conditions-2.0.0-SNAPSHOT.jar -DgroupId=org.interledger -DartifactId=java-crypto-conditions -Dversion=2.0.0-SNAPSHOT -Dpackaging=jar
+
 branches:
  only:
  - master

README.md

@@ -115,25 +115,25 @@ BigchainDbConfigBuilder
 <h4>Send a Transaction</h4>
 
 ```java
-TransactionApi.sendTransaction(Transaction transaction) throws IOException
+TransactionsApi.sendTransaction(Transaction transaction) throws IOException
 ```
 
 <h4>Send a Transaction with Callback</h4>
 
 ```java
-TransactionApi.sendTransaction(Transaction transaction, final GenericCallback callback) 
+TransactionsApi.sendTransaction(Transaction transaction, final GenericCallback callback) 
 ```
 
 <h4>Get Transaction given a Transaction Id</h4>
 
 ```java
-Transaction TransactionApi.getTransactionById(String id) throws IOException
+Transaction TransactionsApi.getTransactionById(String id) throws IOException
 ```
 
 <h4>Get Transaction given an Asset Id</h4>
 
 ```java
-Transactions TransactionApi.getTransactionsByAssetId(String assetId, Operations operation)
+Transactions TransactionsApi.getTransactionsByAssetId(String assetId, Operations operation)
 ```
 
 <h3>Outputs</h3>

pom.xml

@@ -68,11 +68,6 @@
 <artifactId>commons-codec</artifactId>
 <version>1.10</version>
 </dependency>
-<dependency>
-<groupId>org.json</groupId>
-<artifactId>json</artifactId>
-<version>20170516</version>
-</dependency>
 <dependency>
 <groupId>com.google.code.gson</groupId>
 <artifactId>gson</artifactId>

src/main/java/com/authenteq/api/TransactionsApi.java

@@ -10,7 +10,6 @@
 import com.authenteq.util.NetworkUtils;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import org.json.JSONException;
 
 import java.io.IOException;
 import java.util.logging.Logger;
@@ -75,20 +74,16 @@ public static Transaction getTransactionById(String id) throws IOException {
  * @param operation
  * the operation
  * @return the transactions by asset id
- * @throws JSONException
- * the JSON exception
  * @throws IOException
  * Signals that an I/O exception has occurred.
  */
 public static Transactions getTransactionsByAssetId(String assetId, Operations operation)
-throws JSONException, IOException {
+throws IOException {
 LOGGER.info("getTransactionsByAssetId Call :" + assetId + " operation " + operation);
 Response response = NetworkUtils.sendGetRequest(
 BigChainDBGlobals.getBaseUrl() + BigchainDbApi.TRANSACTIONS + "?asset_id=" + assetId + "&operation=" + operation);
 String body = response.body().string();
 response.close();
 return JsonUtils.fromJson(body, Transactions.class);
-
 }
-
 }

src/main/java/com/authenteq/builders/BigchainDbConfigBuilder.java

@@ -8,7 +8,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
-import com.authenteq.api.AccountApi;
 import com.authenteq.constants.BigchainDbApi;
 import com.authenteq.model.ApiEndpoints;
 import com.authenteq.model.BigChainDBGlobals;
@@ -25,9 +24,8 @@
  * The Class BigchainDbConfigBuilder.
  */
 public class BigchainDbConfigBuilder {
-
-private static final Logger LOGGER = Logger.getLogger(AccountApi.class.getName());
-
+
+private static final Logger LOGGER = Logger.getLogger(BigchainDbConfigBuilder.class.getName());
 /**
  * Instantiates a new bigchain db config builder.
  */
@@ -74,11 +72,6 @@ public interface ITokens {
  * Setup.
  */
 void setup();
-
-/**
- * Setup.
- */
-
 }
 
 /**