Merge pull request Philipinho#11 from fabianpol/add-missing-market-fi…

…elds Introduce new fields for MarketData.
Darkkandadr · Feb 19, 2021 · 47f333a · 47f333a
2 parents e5a72c7 + f352a1a
commit 47f333a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 95 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,11 @@ cmake-build-*/
 # IntelliJ
 out/
 
+# Eclipse
+.settings
+.classpath
+.project
+
 # Maven
 target/
 .settings

diff --git a/src/main/java/com/litesoftwares/coingecko/CoinGeckoApiService.java b/src/main/java/com/litesoftwares/coingecko/CoinGeckoApiService.java
@@ -14,7 +14,6 @@
 import retrofit2.http.Path;
 import retrofit2.http.Query;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

diff --git a/src/main/java/com/litesoftwares/coingecko/domain/Coins/CoinHistoryById.java b/src/main/java/com/litesoftwares/coingecko/domain/Coins/CoinHistoryById.java
@@ -3,11 +3,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.litesoftwares.coingecko.domain.Coins.CoinData.*;
 import com.litesoftwares.coingecko.domain.Shared.Image;
-import com.litesoftwares.coingecko.domain.Shared.Ticker;
-import com.litesoftwares.coingecko.domain.Status.StatusUpdates;
-import lombok.*;
 
-import java.util.List;
+import lombok.Data;
+
 import java.util.Map;
 
 @Data

diff --git a/src/main/java/com/litesoftwares/coingecko/domain/Coins/MarketData.java b/src/main/java/com/litesoftwares/coingecko/domain/Coins/MarketData.java
@@ -18,6 +18,12 @@ public class MarketData {
     private Map<String, Double> athChangePercentage;
     @JsonProperty("ath_date")
     private Map<String, String> athDate;
+    @JsonProperty("atl")
+    private Map<String, Double> atl;
+    @JsonProperty("atl_change_percentage")
+    private Map<String, Double> atlChangePercentage;
+    @JsonProperty("atl_date")
+    private Map<String, String> atlDate;
     @JsonProperty("market_cap")
     private Map<String, Double> marketCap;
     @JsonProperty("market_cap_rank")
@@ -70,8 +76,12 @@ public class MarketData {
     private Map<String, Double> marketCapChange24hInCurrency;
     @JsonProperty("market_cap_change_percentage_24h_in_currency")
     private Map<String, Double> marketCapChangePercentage24hInCurrency;
+    @JsonProperty("fully_diluted_valuation")
+    private Map<String, Long> fullyDilutedValuation;
     @JsonProperty("total_supply")
     private long totalSupply;
+    @JsonProperty("max_supply")
+    private long maxSupply;
     @JsonProperty("circulating_supply")
     private double circulatingSupply;
     @JsonProperty("last_updated")

diff --git a/src/main/java/com/litesoftwares/coingecko/domain/Exchanges/ExchangeById.java b/src/main/java/com/litesoftwares/coingecko/domain/Exchanges/ExchangeById.java
@@ -14,93 +14,4 @@ public class ExchangeById extends Exchanges{
     @JsonProperty("status_updates")
     private List<Object> statusUpdates;
 
-    @Override
-    public String getId(){
-        return super.getId();
-    }
-
-    @Override
-    public void setId(String id){
-        super.setId(id);
-    }
-    @Override
-    public String getName() {
-        return super.getName();
-    }
-
-    @Override
-    public void setName(String name) {
-        super.setName(name);
-    }
-
-    @Override
-    public long getYearEstablished() {
-        return super.getYearEstablished();
-    }
-
-    @Override
-    public void setYearEstablished(long yearEstablished) {
-        super.setYearEstablished(yearEstablished);
-    }
-
-    @Override
-    public String getCountry() {
-        return super.getCountry();
-    }
-
-    @Override
-    public void setCountry(String country) {
-        super.setCountry(country);
-    }
-
-    @Override
-    public Object getDescription() {
-        return super.getDescription();
-    }
-
-    @Override
-    public void setDescription(Object description) {
-        super.setDescription(description);
-    }
-
-    @Override
-    public String getUrl() {
-        return super.getUrl();
-    }
-
-    @Override
-    public void setUrl(String url) {
-        super.setUrl(url);
-    }
-
-    @Override
-    public String getImage() {
-        return super.getImage();
-    }
-
-    @Override
-    public void setImage(String image) {
-        super.setImage(image);
-    }
-
-    @Override
-    public boolean isHasTradingIncentive() {
-        return super.isHasTradingIncentive();
-    }
-
-    @Override
-    public void setHasTradingIncentive(boolean hasTradingIncentive) {
-        super.setHasTradingIncentive(hasTradingIncentive);
-    }
-
-    @Override
-    public double getTradeVolume24hBtc() {
-        return super.getTradeVolume24hBtc();
-    }
-
-    @Override
-    public void setTradeVolume24hBtc(double tradeVolume24hBtc) {
-        super.setTradeVolume24hBtc(tradeVolume24hBtc);
-    }
-
 }
diff --git a/src/test/java/com/litesoftwares/coingecko/examples/GlobalExample.java b/src/test/java/com/litesoftwares/coingecko/examples/GlobalExample.java
@@ -4,7 +4,6 @@
 import com.litesoftwares.coingecko.domain.Global.Global;
 import com.litesoftwares.coingecko.impl.CoinGeckoApiClientImpl;
 
-import java.util.Map;
 
 public class GlobalExample {
     public static void main(String[] args) {