feat: convert exchangeVendor from to enum class to data class using s…

…tatic fields
namjug-kim · Jul 3, 2019 · 5627851 · 5627851
1 parent aed0e42
commit 5627851
Show file tree

Hide file tree

Showing 35 changed files with 178 additions and 140 deletions.
diff --git a/...inance/src/test/java/com/njkim/reactivecrypto/binance/BinanceWebsocketClientJavaTest.java b/...inance/src/test/java/com/njkim/reactivecrypto/binance/BinanceWebsocketClientJavaTest.java
@@ -1,6 +1,7 @@
 package com.njkim.reactivecrypto.binance;
 
 import com.njkim.reactivecrypto.core.common.model.ExchangeVendor;
+import com.njkim.reactivecrypto.core.common.model.currency.Currency;
 import com.njkim.reactivecrypto.core.common.model.currency.CurrencyPair;
 import com.njkim.reactivecrypto.core.common.model.order.OrderBook;
 import com.njkim.reactivecrypto.core.common.model.order.TickData;
@@ -29,7 +30,7 @@ public void binance_tick_data_subscribe() {
         assertThat(tickData.getCurrencyPair())
                 .isEqualTo(targetCurrencyPair);
         assertThat(tickData.getExchangeVendor())
-                .isEqualByComparingTo(ExchangeVendor.BINANCE);
+                .isEqualTo(ExchangeVendor.BINANCE);
         assertThat(tickData.getPrice())
                 .isGreaterThan(BigDecimal.ZERO);
         assertThat(tickData.getQuantity())
@@ -51,7 +52,7 @@ public void binance_orderBook_subscribe() {
         assertThat(orderBook.getCurrencyPair())
                 .isEqualTo(targetCurrencyPair);
         assertThat(orderBook.getExchangeVendor())
-                .isEqualByComparingTo(ExchangeVendor.BINANCE);
+                .isEqualTo(ExchangeVendor.BINANCE);
         assertThat(orderBook.getAsks())
                 .isNotEmpty();
         assertThat(orderBook.getBids())

diff --git a/...to-binance/src/test/kotlin/com/njkim/reactivecrypto/binance/BinanceWebsocketClientTest.kt b/...to-binance/src/test/kotlin/com/njkim/reactivecrypto/binance/BinanceWebsocketClientTest.kt
@@ -21,13 +21,14 @@ class BinanceWebsocketClientTest {
         // when
         val tickData = binanceWebsocketClient.blockFirst(Duration.ofSeconds(10))!!
         log.info { tickData }
+        log.info { tickData.exchangeVendor.toString() }
 
         // then
         Assertions.assertThat(tickData).isNotNull
         Assertions.assertThat(tickData.currencyPair)
             .isEqualTo(targetCurrencyPair)
         Assertions.assertThat(tickData.exchangeVendor)
-            .isEqualByComparingTo(ExchangeVendor.BINANCE)
+            .isEqualTo(ExchangeVendor.BINANCE)
         Assertions.assertThat(tickData.price)
             .isGreaterThan(BigDecimal.ZERO)
         Assertions.assertThat(tickData.quantity)
@@ -50,7 +51,7 @@ class BinanceWebsocketClientTest {
         Assertions.assertThat(orderBook.currencyPair)
             .isEqualTo(targetCurrencyPair)
         Assertions.assertThat(orderBook.exchangeVendor)
-            .isEqualByComparingTo(ExchangeVendor.BINANCE)
+            .isEqualTo(ExchangeVendor.BINANCE)
         Assertions.assertThat(orderBook.asks)
             .isNotEmpty
         Assertions.assertThat(orderBook.bids)

diff --git a/...ithumb/src/test/java/com/njkim/reactivecrypto/bithumb/BithumbWebsocketClientJavaTest.java b/...ithumb/src/test/java/com/njkim/reactivecrypto/bithumb/BithumbWebsocketClientJavaTest.java
@@ -30,7 +30,7 @@ public void bithumb_tick_data_subscribe() {
                     assertThat(tickData.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(tickData.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITHUMB);
+                            .isEqualTo(ExchangeVendor.BITHUMB);
                     assertThat(tickData.getPrice())
                             .isGreaterThan(BigDecimal.ZERO);
                     assertThat(tickData.getQuantity())
@@ -41,7 +41,7 @@ public void bithumb_tick_data_subscribe() {
                     assertThat(tickData.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(tickData.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITHUMB);
+                            .isEqualTo(ExchangeVendor.BITHUMB);
                     assertThat(tickData.getPrice())
                             .isGreaterThan(BigDecimal.ZERO);
                     assertThat(tickData.getQuantity())
@@ -66,7 +66,7 @@ public void bithumb_orderBook_subscribe() {
                     assertThat(orderBook.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(orderBook.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITHUMB);
+                            .isEqualTo(ExchangeVendor.BITHUMB);
                     assertThat(orderBook.getAsks())
                             .isNotEmpty();
                     assertThat(orderBook.getBids())
@@ -93,7 +93,7 @@ public void bithumb_orderBook_subscribe() {
                     assertThat(orderBook.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(orderBook.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITHUMB);
+                            .isEqualTo(ExchangeVendor.BITHUMB);
                     assertThat(orderBook.getAsks())
                             .isNotEmpty();
                     assertThat(orderBook.getBids())

diff --git a/...to-bithumb/src/test/kotlin/com/njkim/reactivecrypto/bithumb/BithumbWebsocketClientTest.kt b/...to-bithumb/src/test/kotlin/com/njkim/reactivecrypto/bithumb/BithumbWebsocketClientTest.kt
@@ -31,7 +31,7 @@ class BithumbWebsocketClientTest {
                 Assertions.assertThat(targetCurrencyPairs.contains(it.currencyPair))
                     .isTrue()
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITHUMB)
+                    .isEqualTo(ExchangeVendor.BITHUMB)
                 Assertions.assertThat(it.price)
                     .isGreaterThan(BigDecimal.ZERO)
                 Assertions.assertThat(it.quantity)
@@ -42,7 +42,7 @@ class BithumbWebsocketClientTest {
                 Assertions.assertThat(targetCurrencyPairs.contains(it.currencyPair))
                     .isTrue()
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITHUMB)
+                    .isEqualTo(ExchangeVendor.BITHUMB)
                 Assertions.assertThat(it.price)
                     .isGreaterThan(BigDecimal.ZERO)
                 Assertions.assertThat(it.quantity)
@@ -68,7 +68,7 @@ class BithumbWebsocketClientTest {
                 Assertions.assertThat(it.currencyPair)
                     .isEqualTo(targetCurrencyPair)
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITHUMB)
+                    .isEqualTo(ExchangeVendor.BITHUMB)
                 Assertions.assertThat(it.asks)
                     .isNotEmpty
                 Assertions.assertThat(it.bids)
@@ -95,7 +95,7 @@ class BithumbWebsocketClientTest {
                 Assertions.assertThat(it.currencyPair)
                     .isEqualTo(targetCurrencyPair)
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITHUMB)
+                    .isEqualTo(ExchangeVendor.BITHUMB)
                 Assertions.assertThat(it.asks)
                     .isNotEmpty
                 Assertions.assertThat(it.bids)

diff --git a/...o-bitmax/src/test/java/com/njkim/reactivecrypto/bitmax/BitmaxWebsocketClientJavaTest.java b/...o-bitmax/src/test/java/com/njkim/reactivecrypto/bitmax/BitmaxWebsocketClientJavaTest.java
@@ -46,7 +46,7 @@ public void tick_data_subscribe() {
                     assertThat(tickData.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(tickData.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITMAX);
+                            .isEqualTo(ExchangeVendor.BITMAX);
                     assertThat(tickData.getPrice())
                             .isGreaterThan(BigDecimal.ZERO);
                     assertThat(tickData.getQuantity())
@@ -57,7 +57,7 @@ public void tick_data_subscribe() {
                     assertThat(tickData.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(tickData.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITMAX);
+                            .isEqualTo(ExchangeVendor.BITMAX);
                     assertThat(tickData.getPrice())
                             .isGreaterThan(BigDecimal.ZERO);
                     assertThat(tickData.getQuantity())
@@ -82,7 +82,7 @@ public void bitmax_orderBook_subscribe() {
                     assertThat(orderBook.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(orderBook.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITMAX);
+                            .isEqualTo(ExchangeVendor.BITMAX);
                     assertThat(orderBook.getAsks())
                             .isNotEmpty();
                     assertThat(orderBook.getBids())
@@ -109,7 +109,7 @@ public void bitmax_orderBook_subscribe() {
                     assertThat(orderBook.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(orderBook.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITMAX);
+                            .isEqualTo(ExchangeVendor.BITMAX);
                     assertThat(orderBook.getAsks())
                             .isNotEmpty();
                     assertThat(orderBook.getBids())

diff --git a/...rypto-bitmax/src/test/kotlin/com/njkim/reactivecrypto/bitmax/BitmaxWebsocketClientTest.kt b/...rypto-bitmax/src/test/kotlin/com/njkim/reactivecrypto/bitmax/BitmaxWebsocketClientTest.kt
@@ -44,7 +44,7 @@ class BitmaxWebsocketClientTest {
                 Assertions.assertThat(it.currencyPair)
                     .isEqualTo(targetCurrencyPair)
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITMAX)
+                    .isEqualTo(ExchangeVendor.BITMAX)
                 Assertions.assertThat(it.price)
                     .isGreaterThan(BigDecimal.ZERO)
                 Assertions.assertThat(it.quantity)
@@ -55,7 +55,7 @@ class BitmaxWebsocketClientTest {
                 Assertions.assertThat(it.currencyPair)
                     .isEqualTo(targetCurrencyPair)
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITMAX)
+                    .isEqualTo(ExchangeVendor.BITMAX)
                 Assertions.assertThat(it.price)
                     .isGreaterThan(BigDecimal.ZERO)
                 Assertions.assertThat(it.quantity)
@@ -83,7 +83,7 @@ class BitmaxWebsocketClientTest {
                 Assertions.assertThat(it.currencyPair)
                     .isEqualTo(targetCurrencyPair)
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITMAX)
+                    .isEqualTo(ExchangeVendor.BITMAX)
                 Assertions.assertThat(it.asks)
                     .isNotEmpty
                 Assertions.assertThat(it.bids)
@@ -112,7 +112,7 @@ class BitmaxWebsocketClientTest {
                 Assertions.assertThat(it.currencyPair)
                     .isEqualTo(targetCurrencyPair)
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITMAX)
+                    .isEqualTo(ExchangeVendor.BITMAX)
                 Assertions.assertThat(it.asks)
                     .isNotEmpty
                 Assertions.assertThat(it.bids)

diff --git a/...o-bitmex/src/test/java/com/njkim/reactivecrypto/bitmex/BitmexWebsocketClientJavaTest.java b/...o-bitmex/src/test/java/com/njkim/reactivecrypto/bitmex/BitmexWebsocketClientJavaTest.java
@@ -46,7 +46,7 @@ public void bitmex_tick_data_subscribe() {
                     assertThat(tickData.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(tickData.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITMEX);
+                            .isEqualTo(ExchangeVendor.BITMEX);
                     assertThat(tickData.getPrice())
                             .isGreaterThan(BigDecimal.ZERO);
                     assertThat(tickData.getQuantity())
@@ -57,7 +57,7 @@ public void bitmex_tick_data_subscribe() {
                     assertThat(tickData.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(tickData.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITMEX);
+                            .isEqualTo(ExchangeVendor.BITMEX);
                     assertThat(tickData.getPrice())
                             .isGreaterThan(BigDecimal.ZERO);
                     assertThat(tickData.getQuantity())
@@ -82,7 +82,7 @@ public void bitmex_orderBook_subscribe() {
                     assertThat(orderBook.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(orderBook.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITMEX);
+                            .isEqualTo(ExchangeVendor.BITMEX);
                     assertThat(orderBook.getAsks())
                             .isNotEmpty();
                     assertThat(orderBook.getBids())
@@ -109,7 +109,7 @@ public void bitmex_orderBook_subscribe() {
                     assertThat(orderBook.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(orderBook.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITMEX);
+                            .isEqualTo(ExchangeVendor.BITMEX);
                     assertThat(orderBook.getAsks())
                             .isNotEmpty();
                     assertThat(orderBook.getBids())

diff --git a/...rypto-bitmex/src/test/kotlin/com/njkim/reactivecrypto/bitmex/BitmexWebsocketClientTest.kt b/...rypto-bitmex/src/test/kotlin/com/njkim/reactivecrypto/bitmex/BitmexWebsocketClientTest.kt
@@ -43,7 +43,7 @@ class BitmexWebsocketClientTest {
                 Assertions.assertThat(it.currencyPair)
                     .isEqualTo(targetCurrencyPair)
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITMEX)
+                    .isEqualTo(ExchangeVendor.BITMEX)
                 Assertions.assertThat(it.price)
                     .isGreaterThan(BigDecimal.ZERO)
                 Assertions.assertThat(it.quantity)
@@ -54,7 +54,7 @@ class BitmexWebsocketClientTest {
                 Assertions.assertThat(it.currencyPair)
                     .isEqualTo(targetCurrencyPair)
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITMEX)
+                    .isEqualTo(ExchangeVendor.BITMEX)
                 Assertions.assertThat(it.price)
                     .isGreaterThan(BigDecimal.ZERO)
                 Assertions.assertThat(it.quantity)
@@ -80,7 +80,7 @@ class BitmexWebsocketClientTest {
                 Assertions.assertThat(it.currencyPair)
                     .isEqualTo(targetCurrencyPair)
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITMEX)
+                    .isEqualTo(ExchangeVendor.BITMEX)
                 Assertions.assertThat(it.asks)
                     .isNotEmpty
                 Assertions.assertThat(it.bids)
@@ -107,7 +107,7 @@ class BitmexWebsocketClientTest {
                 Assertions.assertThat(it.currencyPair)
                     .isEqualTo(targetCurrencyPair)
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITMEX)
+                    .isEqualTo(ExchangeVendor.BITMEX)
                 Assertions.assertThat(it.asks)
                     .isNotEmpty
                 Assertions.assertThat(it.bids)

diff --git a/...tamp/src/test/java/com/njkim/reactivecrypto/bitstamp/BitstampWebsocketClientJavaTest.java b/...tamp/src/test/java/com/njkim/reactivecrypto/bitstamp/BitstampWebsocketClientJavaTest.java
@@ -47,7 +47,7 @@ public void tick_data_subscribe() {
                     assertThat(tickData.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(tickData.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITSTAMP);
+                            .isEqualTo(ExchangeVendor.BITSTAMP);
                     assertThat(tickData.getPrice())
                             .isGreaterThan(BigDecimal.ZERO);
                     assertThat(tickData.getQuantity())
@@ -58,7 +58,7 @@ public void tick_data_subscribe() {
                     assertThat(tickData.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(tickData.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITSTAMP);
+                            .isEqualTo(ExchangeVendor.BITSTAMP);
                     assertThat(tickData.getPrice())
                             .isGreaterThan(BigDecimal.ZERO);
                     assertThat(tickData.getQuantity())
@@ -83,7 +83,7 @@ public void orderBook_subscribe() {
                     assertThat(orderBook.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(orderBook.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITSTAMP);
+                            .isEqualTo(ExchangeVendor.BITSTAMP);
                     assertThat(orderBook.getAsks())
                             .isNotEmpty();
                     assertThat(orderBook.getBids())
@@ -110,7 +110,7 @@ public void orderBook_subscribe() {
                     assertThat(orderBook.getCurrencyPair())
                             .isEqualTo(targetCurrencyPair);
                     assertThat(orderBook.getExchangeVendor())
-                            .isEqualByComparingTo(ExchangeVendor.BITSTAMP);
+                            .isEqualTo(ExchangeVendor.BITSTAMP);
                     assertThat(orderBook.getAsks())
                             .isNotEmpty();
                     assertThat(orderBook.getBids())

diff --git a/...bitstamp/src/test/kotlin/com/njkim/reactivecrypto/bitstamp/BitstampWebsocketClientTest.kt b/...bitstamp/src/test/kotlin/com/njkim/reactivecrypto/bitstamp/BitstampWebsocketClientTest.kt
@@ -43,7 +43,7 @@ class BitstampWebsocketClientTest {
                 Assertions.assertThat(it.currencyPair)
                     .isEqualTo(targetCurrencyPair)
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITSTAMP)
+                    .isEqualTo(ExchangeVendor.BITSTAMP)
                 Assertions.assertThat(it.price)
                     .isGreaterThan(BigDecimal.ZERO)
                 Assertions.assertThat(it.quantity)
@@ -54,7 +54,7 @@ class BitstampWebsocketClientTest {
                 Assertions.assertThat(it.currencyPair)
                     .isEqualTo(targetCurrencyPair)
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITSTAMP)
+                    .isEqualTo(ExchangeVendor.BITSTAMP)
                 Assertions.assertThat(it.price)
                     .isGreaterThan(BigDecimal.ZERO)
                 Assertions.assertThat(it.quantity)
@@ -80,7 +80,7 @@ class BitstampWebsocketClientTest {
                 Assertions.assertThat(it.currencyPair)
                     .isEqualTo(targetCurrencyPair)
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITSTAMP)
+                    .isEqualTo(ExchangeVendor.BITSTAMP)
                 Assertions.assertThat(it.asks)
                     .isNotEmpty
                 Assertions.assertThat(it.bids)
@@ -107,7 +107,7 @@ class BitstampWebsocketClientTest {
                 Assertions.assertThat(it.currencyPair)
                     .isEqualTo(targetCurrencyPair)
                 Assertions.assertThat(it.exchangeVendor)
-                    .isEqualByComparingTo(ExchangeVendor.BITSTAMP)
+                    .isEqualTo(ExchangeVendor.BITSTAMP)
                 Assertions.assertThat(it.asks)
                     .isNotEmpty
                 Assertions.assertThat(it.bids)