From a0b48a6165cbf94f9d0ef8e1969fc177021ed919 Mon Sep 17 00:00:00 2001 From: sidhujag Date: Sun, 3 Jun 2018 16:56:41 -0700 Subject: [PATCH] use map instead of class json parser --- .../dash/sources/coinmarketcap/CMCData.java | 15 ---- .../sources/coinmarketcap/CMCMetaData.java | 5 -- .../dash/sources/coinmarketcap/CMCQuote.java | 10 --- .../dash/sources/coinmarketcap/CMCQuotes.java | 5 -- .../dash/sources/coinmarketcap/CMCTicker.java | 69 ------------------- .../CoinmarketcapRateSource.java | 6 +- .../coinmarketcap/ICoinmarketcapAPI.java | 2 +- 7 files changed, 5 insertions(+), 107 deletions(-) delete mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCData.java delete mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCMetaData.java delete mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCQuote.java delete mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCQuotes.java delete mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCTicker.java diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCData.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCData.java deleted file mode 100644 index 0176520..0000000 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCData.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.generalbytes.batm.server.extensions.extra.dash.sources.coinmarketcap; -import java.math.BigDecimal; -import com.generalbytes.batm.server.extensions.extra.dash.sources.coinmarketcap.CMCQuotes; -public class CMCData { - public String id; - public String name; - public String symbol; - public String website_slug; - public BigDecimal rank; - public BigDecimal circulating_supply; - public BigDecimal total_supply; - public BigDecimal max_supply; - public CMCQuotes quotes; - public long last_updated; -} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCMetaData.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCMetaData.java deleted file mode 100644 index 3eb43e2..0000000 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCMetaData.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.generalbytes.batm.server.extensions.extra.dash.sources.coinmarketcap; -public class CMCMetaData { - public long timestamp; - public String error; -} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCQuote.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCQuote.java deleted file mode 100644 index e2a3df0..0000000 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCQuote.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.generalbytes.batm.server.extensions.extra.dash.sources.coinmarketcap; -import java.math.BigDecimal; -public class CMCQuote { - public BigDecimal price; - public BigDecimal volume_24h; - public BigDecimal market_cap; - public BigDecimal percent_change_1h; - public BigDecimal percent_change_24h; - public BigDecimal percent_change_7d; -} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCQuotes.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCQuotes.java deleted file mode 100644 index 8ff7455..0000000 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCQuotes.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.generalbytes.batm.server.extensions.extra.dash.sources.coinmarketcap; -import com.generalbytes.batm.server.extensions.extra.dash.sources.coinmarketcap.CMCQuote; -public class CMCQuotes { - public CMCQuote USD; -} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCTicker.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCTicker.java deleted file mode 100644 index b922f71..0000000 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CMCTicker.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.generalbytes.batm.server.extensions.extra.dash.sources.coinmarketcap; -import com.generalbytes.batm.server.extensions.extra.dash.sources.coinmarketcap.CMCData; -import com.generalbytes.batm.server.extensions.extra.dash.sources.coinmarketcap.CMCMetaData; -import java.math.BigDecimal; -public class CMCTicker { - private CMCData jsondData; - private CMCMetaData metaData; - - public String getId() { - return jsondData.id; - } - - public String getName() { - return jsondData.name; - } - - public String getSymbol() { - return jsondData.symbol; - } - - public String getWebsite_slug() { - return jsondData.website_slug; - } - - public BigDecimal getRank() { - return jsondData.rank; - } - - public BigDecimal getPrice() { - return jsondData.quotes.USD.price; - } - - public BigDecimal get_24h_volume() { - return jsondData.quotes.USD.volume_24h; - } - - public BigDecimal getMarket_cap() { - return jsondData.quotes.USD.market_cap; - } - - public BigDecimal getCirculating_supply() { - return jsondData.circulating_supply; - } - - public BigDecimal getTotal_supply() { - return jsondData.total_supply; - } - - public BigDecimal getMax_supply() { - return jsondData.max_supply; - } - - public BigDecimal getPercent_change_1h() { - return jsondData.quotes.USD.percent_change_1h; - } - - public BigDecimal getPercent_change_24h() { - return jsondData.quotes.USD.percent_change_24h; - } - - public BigDecimal getPercent_change_7d() { - return jsondData.quotes.USD.percent_change_7d; - } - - public long getLast_updated() { - return jsondData.last_updated; - } -} - diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CoinmarketcapRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CoinmarketcapRateSource.java index ec77d31..33763d6 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CoinmarketcapRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CoinmarketcapRateSource.java @@ -88,7 +88,9 @@ public class CoinmarketcapRateSource implements IRateSource { return null; } - CMCTicker ticker = api.getTickers(cryptoId, fiatCurrency); + Map ticker = api.getTickers(cryptoId, fiatCurrency); + JSONObject json = new JSONObject(ticker); + System.out.printf( "JSON: %s", json.toString() ); /*if (cryptoCurrency.equalsIgnoreCase(ticker.getSymbol())) { if (Currencies.EUR.equalsIgnoreCase(fiatCurrency)) { return ticker.getPrice_eur(); @@ -99,6 +101,6 @@ public class CoinmarketcapRateSource implements IRateSource { return ticker.getPrice_usd(); } }*/ - return ticker.getPrice(); + return 0; } } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java index 4708f44..d15799e 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java @@ -25,5 +25,5 @@ import javax.ws.rs.core.MediaType; public interface ICoinmarketcapAPI { @GET @Path("/{id}/") - CMCTicker getTickers(@PathParam("id") Integer id, @QueryParam("convert") String fiatCurrency); + Map getTickers(@PathParam("id") Integer id, @QueryParam("convert") String fiatCurrency); }