Refactoring to make covalent provider generic

src/main/java/com/allmycoins/balance/ethereum/CovalentBalanceItemJson.java → src/main/java/com/allmycoins/balance/covalent/CovalentBalanceItemJson.java

@@ -1,4 +1,4 @@
-package com.allmycoins.balance.ethereum;
+package com.allmycoins.balance.covalent;
 
 import java.math.BigDecimal;
 

src/main/java/com/allmycoins/balance/ethereum/CovalentBalancesDataJson.java → src/main/java/com/allmycoins/balance/covalent/CovalentBalancesDataJson.java

@@ -1,4 +1,4 @@
-package com.allmycoins.balance.ethereum;
+package com.allmycoins.balance.covalent;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 

src/main/java/com/allmycoins/balance/ethereum/CovalentBalancesJson.java → src/main/java/com/allmycoins/balance/covalent/CovalentBalancesJson.java

@@ -1,4 +1,4 @@
-package com.allmycoins.balance.ethereum;
+package com.allmycoins.balance.covalent;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 

src/main/java/com/allmycoins/balance/ethereum/CovalentBalancesRequest.java → src/main/java/com/allmycoins/balance/covalent/CovalentBalancesRequest.java

@@ -1,15 +1,17 @@
-package com.allmycoins.balance.ethereum;
+package com.allmycoins.balance.covalent;
 
 import java.util.Map;
 
 import com.allmycoins.request.GetRequest;
 
 public final class CovalentBalancesRequest implements GetRequest<CovalentBalancesJson> {
 
-	private final String ethAddress;
+	private final String network;
+	private final String publicAddress;
 
-	public CovalentBalancesRequest(String pEthAddress) {
-		ethAddress = pEthAddress;
+	public CovalentBalancesRequest(final String pNetwork, final String pPublicAddress) {
+		network = pNetwork;
+		publicAddress = pPublicAddress;
 	}
 
 	@Override
@@ -19,7 +21,7 @@ public String baseUrl() {
 
 	@Override
 	public String endPoint() {
-		return "/v1/eth-mainnet/address/" + ethAddress + "/balances_v2/";
+		return "/v1/" + network + "/address/" + publicAddress + "/balances_v2/";
 	}
 
 	@Override

src/main/java/com/allmycoins/balance/covalent/CovalentProvider.java

@@ -0,0 +1,44 @@
+package com.allmycoins.balance.covalent;
+
+import java.util.List;
+import java.util.concurrent.Future;
+import java.util.stream.Collectors;
+
+import com.allmycoins.balance.PublicAddressBalanceProvider;
+import com.allmycoins.json.BalanceJson;
+import com.allmycoins.utils.BigDecimalUtils;
+import com.allmycoins.utils.FutureUtils;
+import com.allmycoins.utils.RequestUtils;
+
+public class CovalentProvider implements PublicAddressBalanceProvider {
+
+	private String balanceSource;
+	private String network;
+	private String configKey;
+
+	public CovalentProvider(final String pBalanceSource, final String pNetwork, final String pConfigKey) {
+		balanceSource = pBalanceSource;
+		network = pNetwork;
+		configKey = pConfigKey;
+	}
+
+	@Override
+	public final List<BalanceJson> balance(String publicAddress) {
+		Future<CovalentBalancesJson> futureAmberdataEthTokensJson = RequestUtils
+				.sendRequestFuture(new CovalentBalancesRequest(network, publicAddress));
+
+		CovalentBalancesJson covalentBalancesJson = FutureUtils.futureResult(futureAmberdataEthTokensJson);
+
+		List<CovalentBalanceItemJson> list = List.of(covalentBalancesJson.getData().getItems());
+
+		return list.stream()
+				.map(i -> new BalanceJson(i.getContract_ticker_symbol(),
+						BigDecimalUtils.decimal(i.getBalance(), i.getContract_decimals()), balanceSource))
+				.collect(Collectors.toList());
+	}
+
+	@Override
+	public final String privateConfigKey() {
+		return configKey;
+	}
+}

src/main/java/com/allmycoins/balance/ethereum/EthProvider.java

@@ -1,34 +1,10 @@
 package com.allmycoins.balance.ethereum;
 
-import java.util.List;
-import java.util.concurrent.Future;
-import java.util.stream.Collectors;
+import com.allmycoins.balance.covalent.CovalentProvider;
 
-import com.allmycoins.balance.PublicAddressBalanceProvider;
-import com.allmycoins.json.BalanceJson;
-import com.allmycoins.utils.BigDecimalUtils;
-import com.allmycoins.utils.FutureUtils;
-import com.allmycoins.utils.RequestUtils;
+public final class EthProvider extends CovalentProvider {
 
-public final class EthProvider implements PublicAddressBalanceProvider {
-
-	@Override
-	public List<BalanceJson> balance(String publicAddress) {
-		Future<CovalentBalancesJson> futureAmberdataEthTokensJson = RequestUtils
-				.sendRequestFuture(new CovalentBalancesRequest(publicAddress));
-
-		CovalentBalancesJson covalentBalancesJson = FutureUtils.futureResult(futureAmberdataEthTokensJson);
-
-		List<CovalentBalanceItemJson> list = List.of(covalentBalancesJson.getData().getItems());
-
-		return list.stream()
-				.map(i -> new BalanceJson(i.getContract_ticker_symbol(),
-						BigDecimalUtils.decimal(i.getBalance(), i.getContract_decimals()), "ETH wallet"))
-				.collect(Collectors.toList());
-	}
-
-	@Override
-	public String privateConfigKey() {
-		return "ETH_ADDRESS";
+	public EthProvider() {
+		super("ETH wallet", "eth-mainnet", "ETH_ADDRESS");
 	}
 }