Feature/exception (#56)

Co-authored-by: Eren <[email protected]>

Author: erenalpaslan

src/main/java/mobi/appcent/helium/HeliumSdkClient.java

@@ -11,7 +11,6 @@
 import java.util.Map;
 
 public class HeliumSdkClient {
-    private static final String BASE_API_URL = "https://api.helium.io/v1/";
     private OkHttpClient client;
     protected static final Gson gson = new Gson();
 
@@ -22,9 +21,8 @@ public void initOkHttpClient() {
         this.client = HttpClient.client();
     }
 
-    //TODO: Override base url
     public void setOkHttpClient(OkHttpClient client) {
-        if (this.client == null) {
+        if (client == null) {
             initOkHttpClient();
         }else {
             this.client = client;

src/main/java/mobi/appcent/helium/Main.java

@@ -1,21 +1,21 @@
 package mobi.appcent.helium;
 
 import mobi.appcent.helium.api.HeliumApi;
-
+import mobi.appcent.helium.exception.ApiException;
+import mobi.appcent.helium.response.validator.ValidatorsResponse;
 
 public class Main {
 
     public static void main(String[] args) {
         try {
             HeliumApi heliumApi = new HeliumApi();
             System.out.println(
-                    heliumApi.assertLocations()
-                            .getListOfAssertLocations()
+                    heliumApi.hotspots()
+                            .getHotspots()
                             .execute()
-                            .toString()
             );
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
+        } catch (ApiException e) {
+            System.out.println(e);
         }
 
     }

src/main/java/mobi/appcent/helium/api/AccountApi.java

@@ -7,7 +7,7 @@
 import mobi.appcent.helium.response.validator.ValidatorsResponse;
 import okhttp3.Call;
 
-import java.io.IOException;
+import mobi.appcent.helium.exception.ApiException;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -21,111 +21,106 @@ public static AccountApi getInstance() {
         return new AccountApi();
     }
 
-    @Override
-    String path() {
-        return BASE_URL + "/accounts";
-    }
-
     //region getAccounts
     @Override
-    public AccountsRequest getAccounts() throws IOException {
+    public AccountsRequest getAccounts() {
         return new AccountsRequest(sdkClient);
     }
     //endregion
 
     //region getRichestAccounts
     @Override
-    public RichestAccountsRequest getRichestAccounts() throws IOException {
+    public RichestAccountsRequest getRichestAccounts() {
         return new RichestAccountsRequest(sdkClient);
     }
     //endregion
 
     //region getAccountForAddress
     @Override
-    public AccountForAddressRequest getAccountForAddress(String address) throws IOException {
+    public AccountForAddressRequest getAccountForAddress(String address) {
         return new AccountForAddressRequest(sdkClient, address);
     }
     //endregion
 
     //region getHotspotsForAccount
     @Override
-    public HotspotsForAccountRequest getHotspotsForAccount(String address) throws IOException {
+    public HotspotsForAccountRequest getHotspotsForAccount(String address) {
         return new HotspotsForAccountRequest(sdkClient, address);
     }
     //endregion
 
     //region getValidatorsForAccount
     @Override
-    public ValidatorsForAccountRequest getValidatorsForAccount(String address) throws IOException {
+    public ValidatorsForAccountRequest getValidatorsForAccount(String address) {
         return new ValidatorsForAccountRequest(sdkClient, address);
     }
     //endregion
 
     //region getOUIsForAccount
     @Override
-    public OUIsForAccountRequest getOUIsForAccount(String address) throws IOException {
+    public OUIsForAccountRequest getOUIsForAccount(String address) {
         return new OUIsForAccountRequest(sdkClient, address);
     }
     //endregion
 
     //region getRolesForAccount
     @Override
-    public RolesForAccountRequest getRolesForAccount(String address) throws IOException {
+    public RolesForAccountRequest getRolesForAccount(String address) {
         return new RolesForAccountRequest(sdkClient, address);
     }
     //endregion
 
     //region getRolesCountsForAccount
     @Override
-    public RolesCountsForAccountRequest getRolesCountsForAccount(String address) throws IOException {
+    public RolesCountsForAccountRequest getRolesCountsForAccount(String address){
         return new RolesCountsForAccountRequest(sdkClient, address);
     }
     //endregion
 
     //region getElectionsForAccount
     @Override
-    public ElectionsForAccountRequest getElectionsForAccount(String address) throws IOException {
+    public ElectionsForAccountRequest getElectionsForAccount(String address){
         return new ElectionsForAccountRequest(sdkClient, address);
     }
     //endregion
 
     //region getChallengesForAccount
     @Override
-    public ChallengesForAccountRequest getChallengesForAccount(String address) throws IOException {
+    public ChallengesForAccountRequest getChallengesForAccount(String address){
         return new ChallengesForAccountRequest(sdkClient, address);
     }
     //endregion
 
     //region getPendingTransactionsForAccount
     @Override
-    public PendingTransactionsForAccountRequest getPendingTransactionsForAccount(String address) throws IOException {
+    public PendingTransactionsForAccountRequest getPendingTransactionsForAccount(String address){
         return new PendingTransactionsForAccountRequest(sdkClient, address);
     }
     //endregion
 
     //region getRewardsForAccount
     @Override
-    public RewardsForAccountRequest getRewardsForAccount(String address, String minTime) throws IOException {
+    public RewardsForAccountRequest getRewardsForAccount(String address, String minTime){
         return new RewardsForAccountRequest(sdkClient, address, minTime);
     }
     //endregion
 
     //region getRewardsByRewardsBlockForAccount
     @Override
-    public RewardsByRewardsBlockForAccountRequest getRewardsByRewardsBlockForAccount(String address, String block) throws IOException {
+    public RewardsByRewardsBlockForAccountRequest getRewardsByRewardsBlockForAccount(String address, String block){
         return new RewardsByRewardsBlockForAccountRequest(sdkClient, address, block);
     }
     //endregion
 
     //region getRewardTotalsForAccount
     @Override
-    public RewardTotalsForAccountRequest getRewardTotalsForAccount(String address, String minTime) throws IOException {
+    public RewardTotalsForAccountRequest getRewardTotalsForAccount(String address, String minTime){
         return new RewardTotalsForAccountRequest(sdkClient, address, minTime);
     }
     //endregion
 
     //TODO: 500 response
-    private String getStatsForAccount(String address) throws IOException {
+    private String getStatsForAccount(String address){
         return null;
     }
 }

src/main/java/mobi/appcent/helium/api/AssertLocationsApi.java

@@ -6,10 +6,6 @@
  * Created by erenalpaslan on 3.12.2022
  */
 public class AssertLocationsApi extends BaseApi implements IAssertLocationsAPI{
-    @Override
-    String path() {
-        return null;
-    }
 
     public static AssertLocationsApi getInstance() {
         return new AssertLocationsApi();

src/main/java/mobi/appcent/helium/api/BaseApi.java

@@ -1,12 +1,16 @@
 package mobi.appcent.helium.api;
 
 import com.google.gson.Gson;
-import com.google.gson.JsonParseException;
+import com.google.gson.JsonIOException;
+import com.google.gson.JsonSyntaxException;
 import com.google.gson.stream.JsonReader;
 import mobi.appcent.helium.HeliumSdkClient;
+import mobi.appcent.helium.exception.ApiException;
 import okhttp3.Call;
 import okhttp3.Response;
 
+import mobi.appcent.helium.exception.ApiException;
+
 import java.io.IOException;
 import java.io.StringReader;
 import java.lang.reflect.Type;
@@ -15,50 +19,9 @@
  * Base class for apis
  */
 abstract class BaseApi {
-    private static final Gson gson = new Gson();
-    protected static final String BASE_URL = "https://api.helium.io/v1";
-
-    abstract String path();
-
     protected HeliumSdkClient sdkClient;
 
     protected void setSdkClient(HeliumSdkClient sdkClient) {
         this.sdkClient = sdkClient;
     }
-
-    protected  <T> T execute(Call call, Type returnType) throws IOException {
-        try {
-            Response response = call.execute();
-            return handleResponse(response, returnType);
-        } catch (IOException e) {
-            throw new IOException("Error");
-        }
-    }
-
-    //TODO: Handle Error
-    private <T> T handleResponse(Response response, Type returnType) throws IOException {
-        if(response.isSuccessful()) {
-            if (response.body() != null) {
-                return deserialize(response.body().string(), returnType);
-            }
-        }
-        return null;
-    }
-
-    public static <T> T deserialize(String body, Type returnType) {
-        try {
-            JsonReader jsonReader = new JsonReader(new StringReader(body));
-            // see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
-            jsonReader.setLenient(true);
-            return gson.fromJson(jsonReader, returnType);
-        } catch (JsonParseException e) {
-            // Fallback processing when failed to parse JSON form response body:
-            // return the response body string directly for the String return type;
-            if (returnType.equals(String.class)) {
-                return (T) body;
-            } else {
-                throw (e);
-            }
-        }
-    }
 }

src/main/java/mobi/appcent/helium/api/BlockApi.java

@@ -3,7 +3,7 @@
 import mobi.appcent.helium.request.block.*;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
+import mobi.appcent.helium.exception.ApiException;
 
 /**
  * Created by erenalpaslan on 28.10.2022
@@ -15,43 +15,38 @@ public static BlockApi getInstance() {
     }
 
     @Override
-    String path() {
-        return BASE_URL + "/blocks";
-    }
-
-    @Override
-    public HeightRequest getHeight() throws IOException {
+    public HeightRequest getHeight(){
         return new HeightRequest(sdkClient);
     }
 
     @Override
-    public BlockStatsRequest getBlockStats() throws IOException {
+    public BlockStatsRequest getBlockStats(){
         return new BlockStatsRequest(sdkClient);
     }
 
 
     @Override
-    public BlockDescriptionsRequest getBlockDescriptions() throws IOException {
+    public BlockDescriptionsRequest getBlockDescriptions(){
         return new BlockDescriptionsRequest(sdkClient);
     }
 
     @Override
-    public BlockByGivenHeightRequest getBlockByGivenHeight(@NotNull Integer height) throws IOException {
+    public BlockByGivenHeightRequest getBlockByGivenHeight(@NotNull Integer height){
         return new BlockByGivenHeightRequest(sdkClient, height);
     }
 
     @Override
-    public BlockTransactionsByGivenHeightRequest getBlockTransactionsByGivenHeight(@NotNull Integer height) throws IOException {
+    public BlockTransactionsByGivenHeightRequest getBlockTransactionsByGivenHeight(@NotNull Integer height){
         return new BlockTransactionsByGivenHeightRequest(sdkClient, height);
     }
 
     @Override
-    public BlockByGivenHashRequest getBlockByGivenHash(@NotNull String hash) throws IOException {
+    public BlockByGivenHashRequest getBlockByGivenHash(@NotNull String hash){
         return new BlockByGivenHashRequest(sdkClient, hash);
     }
 
     @Override
-    public BlockTransactionsByGivenHashRequest getBlockTransactionsByGivenHash(@NotNull String hash) throws IOException {
+    public BlockTransactionsByGivenHashRequest getBlockTransactionsByGivenHash(@NotNull String hash){
         return new BlockTransactionsByGivenHashRequest(sdkClient, hash);
     }
 

src/main/java/mobi/appcent/helium/api/ChainVariablesApi.java

@@ -9,10 +9,6 @@
  * Created by erenalpaslan on 26.11.2022
  */
 public class ChainVariablesApi extends BaseApi implements IChainVariablesApi{
-    @Override
-    String path() {
-        return UrlConstant.CHAIN_VARIABLES_PATH;
-    }
 
     public static ChainVariablesApi getInstance() {
         return new ChainVariablesApi();

src/main/java/mobi/appcent/helium/api/ChallengesApi.java

@@ -6,10 +6,6 @@
  * Created by erenalpaslan on 27.11.2022
  */
 public class ChallengesApi extends BaseApi implements IChallengesApi{
-    @Override
-    String path() {
-        return null;
-    }
 
     public static ChallengesApi getInstance() {
         return new ChallengesApi();

src/main/java/mobi/appcent/helium/api/CityApi.java

@@ -1,6 +1,7 @@
 package mobi.appcent.helium.api;
 
 import com.google.gson.reflect.TypeToken;
+import mobi.appcent.helium.exception.ApiException;
 import mobi.appcent.helium.httpClient.HttpMethod;
 import mobi.appcent.helium.request.city.CitiesRequest;
 import mobi.appcent.helium.request.city.CityByGivenCityIdRequest;
@@ -12,7 +13,7 @@
 import okhttp3.Call;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
+import mobi.appcent.helium.exception.ApiException;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -27,22 +28,17 @@ public static CityApi getInstance() {
     }
 
     @Override
-    String path() {
-        return BASE_URL + "/cities";
-    }
-
-    @Override
-    public CitiesRequest getCities() throws IOException {
+    public CitiesRequest getCities(){
         return new CitiesRequest(sdkClient);
     }
 
     @Override
-    public CityByGivenCityIdRequest getCityByGivenCityId(@NotNull String cityId) throws IOException {
+    public CityByGivenCityIdRequest getCityByGivenCityId(@NotNull String cityId){
         return new CityByGivenCityIdRequest(sdkClient, cityId);
     }
 
     @Override
-    public HotspotsByGivenCityIdRequest getHotspotsByGivenCityId(@NotNull String cityId) throws IOException {
+    public HotspotsByGivenCityIdRequest getHotspotsByGivenCityId(@NotNull String cityId){
         return new HotspotsByGivenCityIdRequest(sdkClient, cityId);
     }
 }

src/main/java/mobi/appcent/helium/api/DCBurnsApi.java

@@ -9,11 +9,6 @@
  */
 public class DCBurnsApi extends BaseApi implements IDCBurnsApi{
 
-    @Override
-    String path() {
-        return null;
-    }
-
     public static DCBurnsApi getInstance() {
         return new DCBurnsApi();
     }