cleanup of null safetys

Author: Ebenezer Ackon

etherscanapi/src/main/java/jfyg/account/Account.kt

@@ -18,42 +18,42 @@ class Account : AccountContract {
 
     private val queryUtil = QueryUtils()
 
-    override fun getBalance(account: String?): Single<Double>? =
+    override fun getBalance(account: String?): Single<Double> =
             query.accountBalance("account",
                     "balance",
                     account,
-                    "latest")?.map { it.result?.toDouble() }
+                    "latest").map { it.result?.toDouble() }
 
-    override fun getMultiBalance(accounts: ArrayList<String>?): Single<ArrayList<Balances>>? =
+    override fun getMultiBalance(accounts: ArrayList<String>?): Single<ArrayList<Balances>> =
             query.accountMultiBalance("account",
                     "balancemulti",
                     queryUtil.retrieveAccounts(accounts),
-                    "latest")?.map { it.result }
+                    "latest").map { it.result }
 
-    override fun getBlocks(account: String?): Single<ArrayList<Blocks>>? =
+    override fun getBlocks(account: String?): Single<ArrayList<Blocks>> =
             query.accountBlock("account",
                     "getminedblocks",
                     account,
-                    "blocks")?.map { it.result }
+                    "blocks").map { it.result }
 
-    override fun getTransactions(account: String?): Single<ArrayList<Transactions>>? =
+    override fun getTransactions(account: String?): Single<ArrayList<Transactions>> =
             query.accountTransactions("account",
                     "txlist",
                     account,
                     "0",
                     "99999999",
-                    "asc")?.map { it.result }
+                    "asc").map { it.result }
 
-    override fun getInternalTransactions(account: String?): Single<ArrayList<TransactionsInternal>>? =
+    override fun getInternalTransactions(account: String?): Single<ArrayList<TransactionsInternal>> =
             query.accountInternalTransactions("account",
                     "txlistinternal",
                     account,
                     "0",
                     "99999999",
-                    "asc")?.map { it.result }
+                    "asc").map { it.result }
 
-    override fun getNetworkStatus(): Single<String>? = genericNetworkQuery?.map { it.status }
+    override fun getNetworkStatus(): Single<String> = genericNetworkQuery.map { it.status }
 
-    override fun getNetworkMessage(): Single<String>? = genericNetworkQuery?.map { it.message }
+    override fun getNetworkMessage(): Single<String> = genericNetworkQuery.map { it.message }
 
 }

etherscanapi/src/main/java/jfyg/account/AccountContract.kt

@@ -11,36 +11,36 @@ internal interface AccountContract {
     /**
      * Return network status
      */
-    fun getNetworkStatus(): Single<String>?
+    fun getNetworkStatus(): Single<String>
 
     /**
      * Return network message
      */
-    fun getNetworkMessage(): Single<String>?
+    fun getNetworkMessage(): Single<String>
 
     /**
      * Return account balance
      */
-    fun getBalance(account: String?): Single<Double>?
+    fun getBalance(account: String?): Single<Double>
 
     /**
      * Return balances of multiple accounts separated by commas
      */
-    fun getMultiBalance(accounts: ArrayList<String>?): Single<ArrayList<Balances>>?
+    fun getMultiBalance(accounts: ArrayList<String>?): Single<ArrayList<Balances>>
 
     /**
      * Get list of blocks mined by address
      */
-    fun getBlocks(account: String?): Single<ArrayList<Blocks>>?
+    fun getBlocks(account: String?): Single<ArrayList<Blocks>>
 
     /**
      * Get a list of 'Normal' Transactions By Address
      */
-    fun getTransactions(account: String?): Single<ArrayList<Transactions>>?
+    fun getTransactions(account: String?): Single<ArrayList<Transactions>>
 
     /**
      * Get a list of 'Internal' Transactions by Address
      */
-    fun getInternalTransactions(account: String?): Single<ArrayList<TransactionsInternal>>?
+    fun getInternalTransactions(account: String?): Single<ArrayList<TransactionsInternal>>
 
 }

etherscanapi/src/main/java/jfyg/queries/QueryMediator.kt

@@ -19,44 +19,44 @@ internal class QueryMediator : AccountQueries, StatQueries {
     override fun accountBalance(module: String?,
                                 action: String?,
                                 address: String?,
-                                tag: String?): Single<AccountBalanceResponse>? =
+                                tag: String?): Single<AccountBalanceResponse> =
             RestClient().getQuery().getAccountBalance(module, action, address, tag, ApiKey.takeOff.callApiKey())
 
     override fun accountMultiBalance(module: String?,
                                      action: String?,
                                      address: String?,
-                                     tag: String?): Single<AccountMultiBalanceResponse>? =
+                                     tag: String?): Single<AccountMultiBalanceResponse> =
             RestClient().getQuery().getAccountMultiBalance(module, action, address, tag, ApiKey.takeOff.callApiKey())
 
     override fun accountBlock(module: String?,
                               action: String?,
                               address: String?,
-                              blocktype: String?): Single<AccountBlockResponse>? =
+                              blocktype: String?): Single<AccountBlockResponse> =
             RestClient().getQuery().getAccountBlock(module, action, address, blocktype, ApiKey.takeOff.callApiKey())
 
     override fun accountTransactions(module: String?,
                                      action: String?,
                                      address: String?,
                                      startblock: String?,
                                      endblock: String?,
-                                     sort: String?): Single<AccountTransactionResponse>? =
+                                     sort: String?): Single<AccountTransactionResponse> =
             RestClient().getQuery().getAccountTransactions(module, action, address, startblock, endblock, sort, ApiKey.takeOff.callApiKey())
 
     override fun accountInternalTransactions(module: String?,
                                              action: String?,
                                              address: String?,
                                              startblock: String?,
                                              endblock: String?,
-                                             sort: String?): Single<AccountInternalTransactionResponse>? =
+                                             sort: String?): Single<AccountInternalTransactionResponse> =
             RestClient().getQuery().getAccountInternalTransactions(module, action, address, startblock, endblock, sort, ApiKey.takeOff.callApiKey())
 
     override fun statPrice(module: String,
-                           action: String): Single<StatPriceResponse>? =
+                           action: String): Single<StatPriceResponse> =
             RestClient().getQuery().getStat(module, action, ApiKey.takeOff.callApiKey())
 
 
     override fun statSupply(module: String,
-                            action: String): Single<StatSupplyResponse>? =
+                            action: String): Single<StatSupplyResponse> =
             RestClient().getQuery().getStatSupply(module, action, ApiKey.takeOff.callApiKey())
 
 }

etherscanapi/src/main/java/jfyg/stat/Stat.kt

@@ -11,20 +11,20 @@ class Stat : StatContract {
 
     private val wei = 1000000000000000000 // 1 Ether is 1000000000000000000 Wei
 
-    override fun getTotalSupply(): Single<Double>? = supplyQuery?.map { it.result?.toDouble() }
+    override fun getTotalSupply(): Single<Double> = supplyQuery.map { it.result?.toDouble() }
 
-    override fun getTotalSupplyInWei(): Single<Double>? = supplyQuery?.map { it.result?.toDouble()?.div(wei) }
+    override fun getTotalSupplyInWei(): Single<Double> = supplyQuery.map { it.result?.toDouble()?.div(wei) }
 
-    override fun getLastPriceInUsd(): Single<Float>? = priceQuery?.map { it.result?.ethUsd?.toFloat() }
+    override fun getLastPriceInUsd(): Single<Float> = priceQuery.map { it.result?.ethUsd?.toFloat() }
 
-    override fun getEthTimestamp(): Single<Long>? = priceQuery?.map { it.result?.ethUsdTimestamp?.toLong() }
+    override fun getEthTimestamp(): Single<Long> = priceQuery.map { it.result?.ethUsdTimestamp?.toLong() }
 
-    override fun getLastPriceInBtc(): Single<Float>? = priceQuery?.map { it.result?.ethBtcTimestamp?.toFloat() }
+    override fun getLastPriceInBtc(): Single<Float> = priceQuery.map { it.result?.ethBtcTimestamp?.toFloat() }
 
-    override fun getBtcTimestamp(): Single<Long>? = priceQuery?.map { it.result?.ethBtcTimestamp?.toLong() }
+    override fun getBtcTimestamp(): Single<Long> = priceQuery.map { it.result?.ethBtcTimestamp?.toLong() }
 
-    override fun getNetworkStatus(): Single<String>? = priceQuery?.map { it.status }
+    override fun getNetworkStatus(): Single<String> = priceQuery.map { it.status }
 
-    override fun getNetworkMessage(): Single<String>? = priceQuery?.map { it.message }
+    override fun getNetworkMessage(): Single<String> = priceQuery.map { it.message }
 
 }

etherscanapi/src/main/java/jfyg/stat/StatContract.kt

@@ -7,41 +7,41 @@ internal interface StatContract {
     /**
      * Return total supply of Ether
      */
-    fun getTotalSupply(): Single<Double>?
+    fun getTotalSupply(): Single<Double>
 
     /**
      * Return total supply of Ether in Wei
      */
-    fun getTotalSupplyInWei(): Single<Double>?
+    fun getTotalSupplyInWei(): Single<Double>
 
     /**
      * Return last price of Ether in Btc
      */
-    fun getLastPriceInBtc(): Single<Float>?
+    fun getLastPriceInBtc(): Single<Float>
 
     /**
      * Return timestamp
      */
-    fun getBtcTimestamp(): Single<Long>?
+    fun getBtcTimestamp(): Single<Long>
 
     /**
      * Return last price of Ether in Usd
      */
-    fun getLastPriceInUsd(): Single<Float>?
+    fun getLastPriceInUsd(): Single<Float>
 
     /**
      * Return timestamp
      */
-    fun getEthTimestamp(): Single<Long>?
+    fun getEthTimestamp(): Single<Long>
 
     /**
      * Return network status
      */
-    fun getNetworkStatus(): Single<String>?
+    fun getNetworkStatus(): Single<String>
 
     /**
      * Return network message
      */
-    fun getNetworkMessage(): Single<String>?
+    fun getNetworkMessage(): Single<String>
 
 }