Revert some unnecessary changes made by automated code cleanup

matejsp · Dec 14, 2018 · f47b2cf · f47b2cf
1 parent 833c216
commit f47b2cf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/...ro/src/main/java/info/bitrich/xchangestream/coinbasepro/CoinbaseProStreamingExchange.java b/...ro/src/main/java/info/bitrich/xchangestream/coinbasepro/CoinbaseProStreamingExchange.java
@@ -33,8 +33,8 @@ public Completable connect(ProductSubscription... args) {
         if (args == null || args.length == 0)
             throw new UnsupportedOperationException("The ProductSubscription must be defined!");
         ExchangeSpecification exchangeSpec = getExchangeSpecification();
-        streamingService = new CoinbaseProStreamingService(API_URI, () -> authData(exchangeSpec));
-        streamingMarketDataService = new CoinbaseProStreamingMarketDataService(streamingService);
+        this.streamingService = new CoinbaseProStreamingService(API_URI, () -> authData(exchangeSpec));
+        this.streamingMarketDataService = new CoinbaseProStreamingMarketDataService(streamingService);
         streamingService.subscribeMultipleCurrencyPairs(args);
 
         return streamingService.connect();

diff --git a/...pro/src/main/java/info/bitrich/xchangestream/coinbasepro/CoinbaseProStreamingService.java b/...pro/src/main/java/info/bitrich/xchangestream/coinbasepro/CoinbaseProStreamingService.java
@@ -104,7 +104,7 @@ public void setChannelInactiveHandler(WebSocketClientHandler.WebSocketMessageHan
     }
 
     public void subscribeMultipleCurrencyPairs(ProductSubscription... products) {
-        product = products[0];
+        this.product = products[0];
     }
 
     /**

diff --git a/...a/info/bitrich/xchangestream/coinbasepro/dto/CoinbaseProWebSocketSubscriptionMessage.java b/...a/info/bitrich/xchangestream/coinbasepro/dto/CoinbaseProWebSocketSubscriptionMessage.java
@@ -128,10 +128,10 @@ private void generateSubscriptionMessage(ProductSubscription productSubscription
         this.channels = channels.toArray(new CoinbaseProProductSubsctiption[channels.size()]);
 
         if ( authData != null ) {
-	        key = authData.getKey();
-	        passphrase = authData.getPassphrase();
-	        signature = authData.getSignature();
-	        timestamp = String.valueOf(authData.getTimestamp());
+	        this.key = authData.getKey();
+	        this.passphrase = authData.getPassphrase();
+	        this.signature = authData.getSignature();
+	        this.timestamp = String.valueOf(authData.getTimestamp());
         }
     }
 

diff --git a/...asepro/src/test/java/info/bitrich/xchangestream/coinbasepro/CoinbaseProManualExample.java b/...asepro/src/test/java/info/bitrich/xchangestream/coinbasepro/CoinbaseProManualExample.java
@@ -1,12 +1,13 @@
 package info.bitrich.xchangestream.coinbasepro;
 
-import info.bitrich.xchangestream.core.ProductSubscription;
-import info.bitrich.xchangestream.core.StreamingExchange;
-import info.bitrich.xchangestream.core.StreamingExchangeFactory;
 import org.knowm.xchange.currency.CurrencyPair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import info.bitrich.xchangestream.core.ProductSubscription;
+import info.bitrich.xchangestream.core.StreamingExchange;
+import info.bitrich.xchangestream.core.StreamingExchangeFactory;
+
 public class CoinbaseProManualExample {
     private static final Logger LOG = LoggerFactory.getLogger(CoinbaseProManualExample.class);
 
@@ -36,5 +37,7 @@ public static void main(String[] args) {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
+
+        exchange.disconnect().blockingAwait();
     }
 }