Restructure responses

EbenezerGH · EbenezerGH · commit 61dc2488935e · 2018-12-08T16:18:04.000-05:00
diff --git a/etherscanapi/src/main/java/jfyg/network/NetworkService.kt b/etherscanapi/src/main/java/jfyg/network/NetworkService.kt
@@ -1,18 +1,18 @@
 package jfyg.network
 
 import io.reactivex.Single
-import jfyg.network.response.account.AccountBalanceResponse
-import jfyg.network.response.account.AccountBlockResponse
-import jfyg.network.response.account.ERC20Response
-import jfyg.network.response.account.AccountInternalTxResponse
-import jfyg.network.response.account.AccountMultiBalanceResponse
-import jfyg.network.response.account.AccountTxResponse
-import jfyg.network.response.block.BlockResponse
-import jfyg.network.response.contract.ContractResponse
-import jfyg.network.response.stat.StatPriceResponse
-import jfyg.network.response.stat.StatSupplyResponse
-import jfyg.network.response.transaction.TxContractExecutionResponse
-import jfyg.network.response.transaction.TxContractReceiptResponse
+import jfyg.network.response.AccountBalanceResponse
+import jfyg.network.response.AccountBlockResponse
+import jfyg.network.response.ERC20Response
+import jfyg.network.response.AccountInternalTxResponse
+import jfyg.network.response.AccountMultiBalanceResponse
+import jfyg.network.response.AccountTxResponse
+import jfyg.network.response.BlockResponse
+import jfyg.network.response.ContractResponse
+import jfyg.network.response.StatPriceResponse
+import jfyg.network.response.StatSupplyResponse
+import jfyg.network.response.TxContractExecutionResponse
+import jfyg.network.response.TxContractReceiptResponse
 import retrofit2.http.GET
 import retrofit2.http.Query
 
diff --git a/etherscanapi/src/main/java/jfyg/network/queries/AccountsApi.kt b/etherscanapi/src/main/java/jfyg/network/queries/AccountsApi.kt
@@ -1,12 +1,12 @@
 package jfyg.network.queries
 
 import io.reactivex.Single
-import jfyg.network.response.account.AccountBalanceResponse
-import jfyg.network.response.account.AccountBlockResponse
-import jfyg.network.response.account.ERC20Response
-import jfyg.network.response.account.AccountInternalTxResponse
-import jfyg.network.response.account.AccountMultiBalanceResponse
-import jfyg.network.response.account.AccountTxResponse
+import jfyg.network.response.AccountBalanceResponse
+import jfyg.network.response.AccountBlockResponse
+import jfyg.network.response.ERC20Response
+import jfyg.network.response.AccountInternalTxResponse
+import jfyg.network.response.AccountMultiBalanceResponse
+import jfyg.network.response.AccountTxResponse
 
 /**
  * https://etherscan.io/apis#accounts
diff --git a/etherscanapi/src/main/java/jfyg/network/queries/ApiQuery.kt b/etherscanapi/src/main/java/jfyg/network/queries/ApiQuery.kt
@@ -3,18 +3,18 @@ package jfyg.network.queries
 import io.reactivex.Single
 import jfyg.ApiKey
 import jfyg.network.RestClient
-import jfyg.network.response.account.AccountBalanceResponse
-import jfyg.network.response.account.AccountBlockResponse
-import jfyg.network.response.account.ERC20Response
-import jfyg.network.response.account.AccountInternalTxResponse
-import jfyg.network.response.account.AccountMultiBalanceResponse
-import jfyg.network.response.account.AccountTxResponse
-import jfyg.network.response.block.BlockResponse
-import jfyg.network.response.contract.ContractResponse
-import jfyg.network.response.stat.StatPriceResponse
-import jfyg.network.response.stat.StatSupplyResponse
-import jfyg.network.response.transaction.TxContractExecutionResponse
-import jfyg.network.response.transaction.TxContractReceiptResponse
+import jfyg.network.response.AccountBalanceResponse
+import jfyg.network.response.AccountBlockResponse
+import jfyg.network.response.ERC20Response
+import jfyg.network.response.AccountInternalTxResponse
+import jfyg.network.response.AccountMultiBalanceResponse
+import jfyg.network.response.AccountTxResponse
+import jfyg.network.response.BlockResponse
+import jfyg.network.response.ContractResponse
+import jfyg.network.response.StatPriceResponse
+import jfyg.network.response.StatSupplyResponse
+import jfyg.network.response.TxContractExecutionResponse
+import jfyg.network.response.TxContractReceiptResponse
 
 /**
  * A mediator between the responses and errors that come from every query
diff --git a/etherscanapi/src/main/java/jfyg/network/queries/BlocksApi.kt b/etherscanapi/src/main/java/jfyg/network/queries/BlocksApi.kt
@@ -1,7 +1,7 @@
 package jfyg.network.queries
 
 import io.reactivex.Single
-import jfyg.network.response.block.BlockResponse
+import jfyg.network.response.BlockResponse
 
 /**
  * https://etherscan.io/apis#blocks
diff --git a/etherscanapi/src/main/java/jfyg/network/queries/ContractsApi.kt b/etherscanapi/src/main/java/jfyg/network/queries/ContractsApi.kt
@@ -1,7 +1,7 @@
 package jfyg.network.queries
 
 import io.reactivex.Single
-import jfyg.network.response.contract.ContractResponse
+import jfyg.network.response.ContractResponse
 
 /**
  * Newly verified Contracts are synced to the API servers within 5 minutes or less
diff --git a/etherscanapi/src/main/java/jfyg/network/queries/StatsApi.kt b/etherscanapi/src/main/java/jfyg/network/queries/StatsApi.kt
@@ -1,8 +1,8 @@
 package jfyg.network.queries
 
 import io.reactivex.Single
-import jfyg.network.response.stat.StatPriceResponse
-import jfyg.network.response.stat.StatSupplyResponse
+import jfyg.network.response.StatPriceResponse
+import jfyg.network.response.StatSupplyResponse
 
 internal interface StatsApi {
 
diff --git a/etherscanapi/src/main/java/jfyg/network/queries/TransactionsApi.kt b/etherscanapi/src/main/java/jfyg/network/queries/TransactionsApi.kt
@@ -1,8 +1,8 @@
 package jfyg.network.queries
 
 import io.reactivex.Single
-import jfyg.network.response.transaction.TxContractExecutionResponse
-import jfyg.network.response.transaction.TxContractReceiptResponse
+import jfyg.network.response.TxContractExecutionResponse
+import jfyg.network.response.TxContractReceiptResponse
 
 /**
  * https://etherscan.io/apis#transactions
diff --git a/etherscanapi/src/main/java/jfyg/network/response/AccountResponse.kt b/etherscanapi/src/main/java/jfyg/network/response/AccountResponse.kt
@@ -0,0 +1,33 @@
+package jfyg.network.response
+
+import jfyg.data.*
+
+/**
+ * Balance of Ether existing in an account
+ */
+internal data class AccountBalanceResponse(val result: String? = null) : BaseResponse()
+
+/**
+ * Blocks mined by an account
+ */
+internal data class AccountBlockResponse(val result: List<BlockAccount>? = null) : BaseResponse()
+
+/**
+ * Internal Transactions recorded by an account
+ */
+internal class AccountInternalTxResponse(val result: List<TxsInternal>? = null) : BaseResponse()
+
+/**
+ * Balances of multiple accounts
+ */
+internal data class AccountMultiBalanceResponse(val result: List<Balance>? = null)
+
+/**
+ * Transactions recorded by an account
+ */
+internal data class AccountTxResponse(val result: List<Tx>? = null) : BaseResponse()
+
+/**
+ * ERC20 Transactions recorded by an account
+ */
+internal class ERC20Response(val result: List<ERC20Token>? = null) : BaseResponse()
diff --git a/etherscanapi/src/main/java/jfyg/network/response/BlockResponse.kt b/etherscanapi/src/main/java/jfyg/network/response/BlockResponse.kt
@@ -1,4 +1,4 @@
-package jfyg.network.response.block
+package jfyg.network.response
 
 import jfyg.data.BlockMined
 import jfyg.network.response.BaseResponse
diff --git a/etherscanapi/src/main/java/jfyg/network/response/ContractResponse.kt b/etherscanapi/src/main/java/jfyg/network/response/ContractResponse.kt
@@ -1,4 +1,4 @@
-package jfyg.network.response.contract
+package jfyg.network.response
 
 import jfyg.network.response.BaseResponse
 
diff --git a/etherscanapi/src/main/java/jfyg/network/response/StatResponse.kt b/etherscanapi/src/main/java/jfyg/network/response/StatResponse.kt
@@ -0,0 +1,14 @@
+package jfyg.network.response
+
+import jfyg.data.StatPrice
+import jfyg.network.response.BaseResponse
+
+/**
+ * Response for stat
+ */
+internal data class StatPriceResponse(val result: StatPrice? = null) : BaseResponse()
+
+/**
+ * Response for total supply of ether
+ */
+internal data class StatSupplyResponse(val result: String? = null)
diff --git a/etherscanapi/src/main/java/jfyg/network/response/TxResponse.kt b/etherscanapi/src/main/java/jfyg/network/response/TxResponse.kt
@@ -1,8 +1,14 @@
-package jfyg.network.response.transaction
+package jfyg.network.response
 
 import jfyg.data.TxExecutionStatus
+import jfyg.data.TxReceiptStatus
 import jfyg.network.response.BaseResponse
 
+/**
+ * Check contract receipt status
+ */
+internal data class TxContractReceiptResponse(val result: TxReceiptStatus) : BaseResponse()
+
 /**
  * Check contract execution status
  */
diff --git a/etherscanapi/src/main/java/jfyg/network/response/account/AccountBalanceResponse.kt b/etherscanapi/src/main/java/jfyg/network/response/account/AccountBalanceResponse.kt
diff --git a/etherscanapi/src/main/java/jfyg/network/response/account/AccountBlockResponse.kt b/etherscanapi/src/main/java/jfyg/network/response/account/AccountBlockResponse.kt
diff --git a/etherscanapi/src/main/java/jfyg/network/response/account/AccountInternalTxResponse.kt b/etherscanapi/src/main/java/jfyg/network/response/account/AccountInternalTxResponse.kt
diff --git a/etherscanapi/src/main/java/jfyg/network/response/account/AccountMultiBalanceResponse.kt b/etherscanapi/src/main/java/jfyg/network/response/account/AccountMultiBalanceResponse.kt
diff --git a/etherscanapi/src/main/java/jfyg/network/response/account/AccountTxResponse.kt b/etherscanapi/src/main/java/jfyg/network/response/account/AccountTxResponse.kt
diff --git a/etherscanapi/src/main/java/jfyg/network/response/account/ERC20Response.kt b/etherscanapi/src/main/java/jfyg/network/response/account/ERC20Response.kt
diff --git a/etherscanapi/src/main/java/jfyg/network/response/stat/StatPriceResponse.kt b/etherscanapi/src/main/java/jfyg/network/response/stat/StatPriceResponse.kt
diff --git a/etherscanapi/src/main/java/jfyg/network/response/stat/StatSupplyResponse.kt b/etherscanapi/src/main/java/jfyg/network/response/stat/StatSupplyResponse.kt
diff --git a/etherscanapi/src/main/java/jfyg/network/response/transaction/TxContractReceiptResponse.kt b/etherscanapi/src/main/java/jfyg/network/response/transaction/TxContractReceiptResponse.kt
diff --git a/etherscanapi/src/main/java/jfyg/utils/QueryUtils.kt b/etherscanapi/src/main/java/jfyg/utils/QueryUtils.kt
@@ -8,7 +8,7 @@ internal fun retrieveList(listItems: List<String>?): String {
     var getList = ""
 
     for (item in listItems!!) {
-        getList += item + ","
+        getList += "$item,"
     }
 
     return getList.dropLast(1)
diff --git a/etherscanapi/src/test/java/jfyg/data/account/AccountsTest.kt b/etherscanapi/src/test/java/jfyg/data/account/AccountsTest.kt
@@ -3,12 +3,12 @@ package jfyg.data.account
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import jfyg.network.response.BaseResponse
-import jfyg.network.response.account.AccountBalanceResponse
-import jfyg.network.response.account.AccountBlockResponse
-import jfyg.network.response.account.AccountInternalTxResponse
-import jfyg.network.response.account.AccountMultiBalanceResponse
-import jfyg.network.response.account.AccountTxResponse
-import jfyg.network.response.account.ERC20Response
+import jfyg.network.response.AccountBalanceResponse
+import jfyg.network.response.AccountBlockResponse
+import jfyg.network.response.AccountInternalTxResponse
+import jfyg.network.response.AccountMultiBalanceResponse
+import jfyg.network.response.AccountTxResponse
+import jfyg.network.response.ERC20Response
 import org.junit.Assert.assertEquals
 import org.junit.Assert
 import org.junit.Before
diff --git a/etherscanapi/src/test/java/jfyg/data/block/BlocksTest.kt b/etherscanapi/src/test/java/jfyg/data/block/BlocksTest.kt
@@ -2,7 +2,7 @@ package jfyg.data.block
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
-import jfyg.network.response.block.BlockResponse
+import jfyg.network.response.BlockResponse
 import org.junit.Test
 
 import org.junit.Assert.*
diff --git a/etherscanapi/src/test/java/jfyg/data/contract/ContractsTest.kt b/etherscanapi/src/test/java/jfyg/data/contract/ContractsTest.kt
@@ -3,7 +3,7 @@ package jfyg.data.contract
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import jfyg.network.response.BaseResponse
-import jfyg.network.response.contract.ContractResponse
+import jfyg.network.response.ContractResponse
 import org.junit.Assert
 import org.junit.Test
 
diff --git a/etherscanapi/src/test/java/jfyg/data/stat/StatsTest.kt b/etherscanapi/src/test/java/jfyg/data/stat/StatsTest.kt
@@ -3,8 +3,8 @@ package jfyg.data.stat
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import jfyg.network.response.BaseResponse
-import jfyg.network.response.stat.StatPriceResponse
-import jfyg.network.response.stat.StatSupplyResponse
+import jfyg.network.response.StatPriceResponse
+import jfyg.network.response.StatSupplyResponse
 import org.junit.Before
 import org.junit.Test
 import org.junit.Assert.assertEquals
diff --git a/etherscanapi/src/test/java/jfyg/data/transaction/TransactionsTest.kt b/etherscanapi/src/test/java/jfyg/data/transaction/TransactionsTest.kt
@@ -3,8 +3,8 @@ package jfyg.data.transaction
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import jfyg.network.response.BaseResponse
-import jfyg.network.response.transaction.TxContractExecutionResponse
-import jfyg.network.response.transaction.TxContractReceiptResponse
+import jfyg.network.response.TxContractExecutionResponse
+import jfyg.network.response.TxContractReceiptResponse
 import org.junit.Assert
 import org.junit.Test
 
diff --git a/etherscanapi/src/test/java/jfyg/utils/QueryUtilsTest.kt b/etherscanapi/src/test/java/jfyg/utils/QueryUtilsTest.kt
@@ -14,7 +14,7 @@ internal class QueryUtilsTest {
                 "0x198ef1ec325a96cc354c7266a038be8b5c558f67")
 
         for (addresses in listItems) {
-            getList += addresses + ","
+            getList += "$addresses,"
         }
 
         Assert.assertEquals("0x82e4499D4b2A669831a3881d61BB24f7b620c61a," +

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package jfyg.network.response.block`
	`1`	`+package jfyg.network.response`
`2`	`2`
`3`	`3`	`import jfyg.data.BlockMined`
`4`	`4`	`import jfyg.network.response.BaseResponse`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package jfyg.network.response.contract`
	`1`	`+package jfyg.network.response`
`2`	`2`
`3`	`3`	`import jfyg.network.response.BaseResponse`
`4`	`4`