bump to 4.2.0-SNAPSHOT, remove “polling” from code

SaschaZ · Jan 22, 2017 · 6d8f1ee · 6d8f1ee
1 parent 625e7f8
commit 6d8f1ee
Show file tree

Hide file tree

Showing 811 changed files with 2,881 additions and 2,961 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Usage is very simple: Create an Exchange instance, get the appropriate service,
 
     Exchange bitstamp = ExchangeFactory.INSTANCE.createExchange(BitstampExchange.class.getName());
 
-    PollingMarketDataService marketDataService = bitstamp.getPollingMarketDataService();
+    MarketDataService marketDataService = bitstamp.getMarketDataService();
 
     Ticker ticker = marketDataService.getTicker(CurrencyPair.BTC_USD);
 
@@ -35,8 +35,7 @@ Now go ahead and [study some more examples](http://knowm.org/open-source/xchange
 * [x] active development
 * [x] very minimal 3rd party dependencies
 * [x] modular components
-* [x] polling capability (no streaming)
-
+
 ## More Info
 
 Project Site: <http://knowm.org/open-source/xchange>  
@@ -99,7 +98,7 @@ For snapshots, add the following repository to your pom.xml file.
 
 The current snapshot version is: 
 
-    4.1.1-SNAPSHOT
+    4.2.0-SNAPSHOT
 
 ## Building with Maven
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>org.knowm.xchange</groupId>
 	<artifactId>xchange-parent</artifactId>
-	<version>4.1.1-SNAPSHOT</version>
+	<version>4.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>XChange</name>

diff --git a/xchange-anx/pom.xml b/xchange-anx/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.knowm.xchange</groupId>
 		<artifactId>xchange-parent</artifactId>
-		<version>4.1.1-SNAPSHOT</version>
+		<version>4.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>xchange-anx</artifactId>
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>org.knowm.xchange</groupId>
 			<artifactId>xchange-core</artifactId>
-			<version>4.1.1-SNAPSHOT</version>
+			<version>4.2.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

diff --git a/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/ANXAdapters.java b/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/ANXAdapters.java
@@ -6,14 +6,14 @@
 import java.util.List;
 import java.util.Map;
 
-import org.knowm.xchange.anx.v2.dto.account.polling.ANXAccountInfo;
-import org.knowm.xchange.anx.v2.dto.account.polling.ANXWallet;
+import org.knowm.xchange.anx.v2.dto.account.ANXAccountInfo;
+import org.knowm.xchange.anx.v2.dto.account.ANXWallet;
 import org.knowm.xchange.anx.v2.dto.marketdata.ANXOrder;
 import org.knowm.xchange.anx.v2.dto.marketdata.ANXTicker;
 import org.knowm.xchange.anx.v2.dto.marketdata.ANXTrade;
 import org.knowm.xchange.anx.v2.dto.meta.ANXMetaData;
-import org.knowm.xchange.anx.v2.dto.trade.polling.ANXOpenOrder;
-import org.knowm.xchange.anx.v2.dto.trade.polling.ANXTradeResult;
+import org.knowm.xchange.anx.v2.dto.trade.ANXOpenOrder;
+import org.knowm.xchange.anx.v2.dto.trade.ANXTradeResult;
 import org.knowm.xchange.currency.Currency;
 import org.knowm.xchange.currency.CurrencyPair;
 import org.knowm.xchange.dto.Order.OrderType;

diff --git a/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/ANXExchange.java b/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/ANXExchange.java
@@ -5,9 +5,9 @@
 import org.knowm.xchange.BaseExchange;
 import org.knowm.xchange.ExchangeSpecification;
 import org.knowm.xchange.anx.v2.dto.meta.ANXMetaData;
-import org.knowm.xchange.anx.v2.service.polling.ANXAccountService;
-import org.knowm.xchange.anx.v2.service.polling.ANXMarketDataService;
-import org.knowm.xchange.anx.v2.service.polling.ANXTradeService;
+import org.knowm.xchange.anx.v2.service.ANXAccountService;
+import org.knowm.xchange.anx.v2.service.ANXMarketDataService;
+import org.knowm.xchange.anx.v2.service.ANXTradeService;
 import org.knowm.xchange.utils.nonce.CurrentTimeNonceFactory;
 
 import si.mazi.rescu.SynchronizedValueFactory;
@@ -20,9 +20,9 @@ public class ANXExchange extends BaseExchange {
   @Override
   protected void initServices() {
     // Configure the basic services if configuration does not apply
-    this.pollingMarketDataService = new ANXMarketDataService(this);
-    this.pollingTradeService = new ANXTradeService(this);
-    this.pollingAccountService = new ANXAccountService(this);
+    this.marketDataService = new ANXMarketDataService(this);
+    this.tradeService = new ANXTradeService(this);
+    this.accountService = new ANXAccountService(this);
   }
 
   @Override

diff --git a/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/ANXV2.java b/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/ANXV2.java
@@ -15,20 +15,20 @@
 import javax.ws.rs.core.MediaType;
 
 import org.knowm.xchange.anx.v2.dto.ANXException;
-import org.knowm.xchange.anx.v2.dto.account.polling.ANXAccountInfoWrapper;
-import org.knowm.xchange.anx.v2.dto.account.polling.ANXBitcoinDepositAddressWrapper;
-import org.knowm.xchange.anx.v2.dto.account.polling.ANXWalletHistoryWrapper;
-import org.knowm.xchange.anx.v2.dto.account.polling.ANXWithdrawalResponseWrapper;
+import org.knowm.xchange.anx.v2.dto.account.ANXAccountInfoWrapper;
+import org.knowm.xchange.anx.v2.dto.account.ANXBitcoinDepositAddressWrapper;
+import org.knowm.xchange.anx.v2.dto.account.ANXWalletHistoryWrapper;
+import org.knowm.xchange.anx.v2.dto.account.ANXWithdrawalResponseWrapper;
 import org.knowm.xchange.anx.v2.dto.marketdata.ANXDepthWrapper;
 import org.knowm.xchange.anx.v2.dto.marketdata.ANXDepthsWrapper;
 import org.knowm.xchange.anx.v2.dto.marketdata.ANXTickerWrapper;
 import org.knowm.xchange.anx.v2.dto.marketdata.ANXTickersWrapper;
 import org.knowm.xchange.anx.v2.dto.marketdata.ANXTradesWrapper;
-import org.knowm.xchange.anx.v2.dto.trade.polling.ANXGenericResponse;
-import org.knowm.xchange.anx.v2.dto.trade.polling.ANXLagWrapper;
-import org.knowm.xchange.anx.v2.dto.trade.polling.ANXOpenOrderWrapper;
-import org.knowm.xchange.anx.v2.dto.trade.polling.ANXOrderResultWrapper;
-import org.knowm.xchange.anx.v2.dto.trade.polling.ANXTradeResultWrapper;
+import org.knowm.xchange.anx.v2.dto.trade.ANXGenericResponse;
+import org.knowm.xchange.anx.v2.dto.trade.ANXLagWrapper;
+import org.knowm.xchange.anx.v2.dto.trade.ANXOpenOrderWrapper;
+import org.knowm.xchange.anx.v2.dto.trade.ANXOrderResultWrapper;
+import org.knowm.xchange.anx.v2.dto.trade.ANXTradeResultWrapper;
 
 import si.mazi.rescu.ParamsDigest;
 import si.mazi.rescu.SynchronizedValueFactory;

diff --git a/...2/dto/account/polling/ANXAccountInfo.java → ...ge/anx/v2/dto/account/ANXAccountInfo.java b/...2/dto/account/polling/ANXAccountInfo.java → ...ge/anx/v2/dto/account/ANXAccountInfo.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.account.polling;
+package org.knowm.xchange.anx.v2.dto.account;
 
 import java.math.BigDecimal;
 import java.util.List;

diff --git a/...ccount/polling/ANXAccountInfoWrapper.java → ...v2/dto/account/ANXAccountInfoWrapper.java b/...ccount/polling/ANXAccountInfoWrapper.java → ...v2/dto/account/ANXAccountInfoWrapper.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.account.polling;
+package org.knowm.xchange.anx.v2.dto.account;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...unt/polling/ANXBitcoinDepositAddress.java → ...dto/account/ANXBitcoinDepositAddress.java b/...unt/polling/ANXBitcoinDepositAddress.java → ...dto/account/ANXBitcoinDepositAddress.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.account.polling;
+package org.knowm.xchange.anx.v2.dto.account;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...ling/ANXBitcoinDepositAddressWrapper.java → ...ount/ANXBitcoinDepositAddressWrapper.java b/...ling/ANXBitcoinDepositAddressWrapper.java → ...ount/ANXBitcoinDepositAddressWrapper.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.account.polling;
+package org.knowm.xchange.anx.v2.dto.account;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...anx/v2/dto/account/polling/ANXWallet.java → ...xchange/anx/v2/dto/account/ANXWallet.java b/...anx/v2/dto/account/polling/ANXWallet.java → ...xchange/anx/v2/dto/account/ANXWallet.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.account.polling;
+package org.knowm.xchange.anx.v2.dto.account;
 
 import org.knowm.xchange.anx.v2.dto.ANXValue;
 

diff --git a/...dto/account/polling/ANXWalletHistory.java → .../anx/v2/dto/account/ANXWalletHistory.java b/...dto/account/polling/ANXWalletHistory.java → .../anx/v2/dto/account/ANXWalletHistory.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.account.polling;
+package org.knowm.xchange.anx.v2.dto.account;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...ccount/polling/ANXWalletHistoryEntry.java → ...v2/dto/account/ANXWalletHistoryEntry.java b/...ccount/polling/ANXWalletHistoryEntry.java → ...v2/dto/account/ANXWalletHistoryEntry.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.account.polling;
+package org.knowm.xchange.anx.v2.dto.account;
 
 import org.knowm.xchange.anx.v2.dto.ANXValue;
 

diff --git a/...ount/polling/ANXWalletHistoryWrapper.java → .../dto/account/ANXWalletHistoryWrapper.java b/...ount/polling/ANXWalletHistoryWrapper.java → .../dto/account/ANXWalletHistoryWrapper.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.account.polling;
+package org.knowm.xchange.anx.v2.dto.account;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...ccount/polling/ANXWithdrawalResponse.java → ...v2/dto/account/ANXWithdrawalResponse.java b/...ccount/polling/ANXWithdrawalResponse.java → ...v2/dto/account/ANXWithdrawalResponse.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.account.polling;
+package org.knowm.xchange.anx.v2.dto.account;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...polling/ANXWithdrawalResponseWrapper.java → ...account/ANXWithdrawalResponseWrapper.java b/...polling/ANXWithdrawalResponseWrapper.java → ...account/ANXWithdrawalResponseWrapper.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.account.polling;
+package org.knowm.xchange.anx.v2.dto.account;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...dto/trade/polling/ANXGenericResponse.java → .../anx/v2/dto/trade/ANXGenericResponse.java b/...dto/trade/polling/ANXGenericResponse.java → .../anx/v2/dto/trade/ANXGenericResponse.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.trade.polling;
+package org.knowm.xchange.anx.v2.dto.trade;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...ange/anx/v2/dto/trade/polling/ANXLag.java → ...nowm/xchange/anx/v2/dto/trade/ANXLag.java b/...ange/anx/v2/dto/trade/polling/ANXLag.java → ...nowm/xchange/anx/v2/dto/trade/ANXLag.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.trade.polling;
+package org.knowm.xchange.anx.v2.dto.trade;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...x/v2/dto/trade/polling/ANXLagWrapper.java → ...hange/anx/v2/dto/trade/ANXLagWrapper.java b/...x/v2/dto/trade/polling/ANXLagWrapper.java → ...hange/anx/v2/dto/trade/ANXLagWrapper.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.trade.polling;
+package org.knowm.xchange.anx.v2.dto.trade;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...nx/v2/dto/trade/polling/ANXOpenOrder.java → ...change/anx/v2/dto/trade/ANXOpenOrder.java b/...nx/v2/dto/trade/polling/ANXOpenOrder.java → ...change/anx/v2/dto/trade/ANXOpenOrder.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.trade.polling;
+package org.knowm.xchange.anx.v2.dto.trade;
 
 import org.knowm.xchange.anx.v2.dto.ANXValue;
 

diff --git a/...to/trade/polling/ANXOpenOrderWrapper.java → ...anx/v2/dto/trade/ANXOpenOrderWrapper.java b/...to/trade/polling/ANXOpenOrderWrapper.java → ...anx/v2/dto/trade/ANXOpenOrderWrapper.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.trade.polling;
+package org.knowm.xchange.anx.v2.dto.trade;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/.../v2/dto/trade/polling/ANXOrderResult.java → ...ange/anx/v2/dto/trade/ANXOrderResult.java b/.../v2/dto/trade/polling/ANXOrderResult.java → ...ange/anx/v2/dto/trade/ANXOrderResult.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.trade.polling;
+package org.knowm.xchange.anx.v2.dto.trade;
 
 import org.knowm.xchange.anx.v2.dto.ANXValue;
 

diff --git a/...to/trade/polling/ANXOrderResultTrade.java → ...anx/v2/dto/trade/ANXOrderResultTrade.java b/...to/trade/polling/ANXOrderResultTrade.java → ...anx/v2/dto/trade/ANXOrderResultTrade.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.trade.polling;
+package org.knowm.xchange.anx.v2.dto.trade;
 
 import org.knowm.xchange.anx.v2.dto.ANXValue;
 

diff --git a/.../trade/polling/ANXOrderResultWrapper.java → ...x/v2/dto/trade/ANXOrderResultWrapper.java b/.../trade/polling/ANXOrderResultWrapper.java → ...x/v2/dto/trade/ANXOrderResultWrapper.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.trade.polling;
+package org.knowm.xchange.anx.v2.dto.trade;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/.../v2/dto/trade/polling/ANXTradeResult.java → ...ange/anx/v2/dto/trade/ANXTradeResult.java b/.../v2/dto/trade/polling/ANXTradeResult.java → ...ange/anx/v2/dto/trade/ANXTradeResult.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.trade.polling;
+package org.knowm.xchange.anx.v2.dto.trade;
 
 import java.math.BigDecimal;
 import java.util.Date;

diff --git a/.../trade/polling/ANXTradeResultWrapper.java → ...x/v2/dto/trade/ANXTradeResultWrapper.java b/.../trade/polling/ANXTradeResultWrapper.java → ...x/v2/dto/trade/ANXTradeResultWrapper.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.dto.trade.polling;
+package org.knowm.xchange.anx.v2.dto.trade;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...v2/service/polling/ANXAccountService.java → ...nge/anx/v2/service/ANXAccountService.java b/...v2/service/polling/ANXAccountService.java → ...nge/anx/v2/service/ANXAccountService.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.service.polling;
+package org.knowm.xchange.anx.v2.service;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -8,7 +8,7 @@
 import org.knowm.xchange.anx.v2.ANXAdapters;
 import org.knowm.xchange.currency.Currency;
 import org.knowm.xchange.dto.account.AccountInfo;
-import org.knowm.xchange.service.polling.account.PollingAccountService;
+import org.knowm.xchange.service.account.AccountService;
 
 /**
  * <p>
@@ -18,7 +18,7 @@
  * <li>ANX specific methods to handle account-related operations</li>
  * </ul>
  */
-public class ANXAccountService extends ANXAccountServiceRaw implements PollingAccountService {
+public class ANXAccountService extends ANXAccountServiceRaw implements AccountService {
 
   /**
    * Constructor

diff --git a/...service/polling/ANXAccountServiceRaw.java → .../anx/v2/service/ANXAccountServiceRaw.java b/...service/polling/ANXAccountServiceRaw.java → .../anx/v2/service/ANXAccountServiceRaw.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.service.polling;
+package org.knowm.xchange.anx.v2.service;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -7,19 +7,18 @@
 import org.knowm.xchange.anx.ANXUtils;
 import org.knowm.xchange.anx.v2.ANXV2;
 import org.knowm.xchange.anx.v2.dto.ANXException;
-import org.knowm.xchange.anx.v2.dto.account.polling.ANXAccountInfo;
-import org.knowm.xchange.anx.v2.dto.account.polling.ANXAccountInfoWrapper;
-import org.knowm.xchange.anx.v2.dto.account.polling.ANXBitcoinDepositAddress;
-import org.knowm.xchange.anx.v2.dto.account.polling.ANXBitcoinDepositAddressWrapper;
-import org.knowm.xchange.anx.v2.dto.account.polling.ANXWithdrawalResponse;
-import org.knowm.xchange.anx.v2.dto.account.polling.ANXWithdrawalResponseWrapper;
-import org.knowm.xchange.anx.v2.service.ANXV2Digest;
+import org.knowm.xchange.anx.v2.dto.account.ANXAccountInfo;
+import org.knowm.xchange.anx.v2.dto.account.ANXAccountInfoWrapper;
+import org.knowm.xchange.anx.v2.dto.account.ANXBitcoinDepositAddress;
+import org.knowm.xchange.anx.v2.dto.account.ANXBitcoinDepositAddressWrapper;
+import org.knowm.xchange.anx.v2.dto.account.ANXWithdrawalResponse;
+import org.knowm.xchange.anx.v2.dto.account.ANXWithdrawalResponseWrapper;
 import org.knowm.xchange.utils.Assert;
 
 import si.mazi.rescu.HttpStatusIOException;
 import si.mazi.rescu.RestProxyFactory;
 
-public class ANXAccountServiceRaw extends ANXBasePollingService {
+public class ANXAccountServiceRaw extends ANXBaseService {
 
   private final ANXV2 anxV2;
   private final ANXV2Digest signatureCreator;

diff --git a/...ervice/polling/ANXBasePollingService.java → ...change/anx/v2/service/ANXBaseService.java b/...ervice/polling/ANXBasePollingService.java → ...change/anx/v2/service/ANXBaseService.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.service.polling;
+package org.knowm.xchange.anx.v2.service;
 
 import java.io.IOException;
 
@@ -8,18 +8,18 @@
 import org.knowm.xchange.exceptions.FundsExceededException;
 import org.knowm.xchange.exceptions.NonceException;
 import org.knowm.xchange.service.BaseExchangeService;
-import org.knowm.xchange.service.polling.BasePollingService;
+import org.knowm.xchange.service.BaseService;
 
 import si.mazi.rescu.HttpStatusIOException;
 
-public class ANXBasePollingService extends BaseExchangeService implements BasePollingService {
+public class ANXBaseService extends BaseExchangeService implements BaseService {
 
   /**
    * Constructor
    *
    * @param exchange
    */
-  public ANXBasePollingService(Exchange exchange) {
+  public ANXBaseService(Exchange exchange) {
 
     super(exchange);
   }

diff --git a/...service/polling/ANXMarketDataService.java → .../anx/v2/service/ANXMarketDataService.java b/...service/polling/ANXMarketDataService.java → .../anx/v2/service/ANXMarketDataService.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.service.polling;
+package org.knowm.xchange.anx.v2.service;
 
 import java.io.IOException;
 import java.util.Date;
@@ -14,7 +14,7 @@
 import org.knowm.xchange.dto.marketdata.Trades;
 import org.knowm.xchange.dto.trade.LimitOrder;
 import org.knowm.xchange.exceptions.ExchangeException;
-import org.knowm.xchange.service.polling.marketdata.PollingMarketDataService;
+import org.knowm.xchange.service.marketdata.MarketDataService;
 
 /**
  * <p>
@@ -24,7 +24,7 @@
  * <li>Provides access to various market data values</li>
  * </ul>
  */
-public class ANXMarketDataService extends ANXMarketDataServiceRaw implements PollingMarketDataService {
+public class ANXMarketDataService extends ANXMarketDataServiceRaw implements MarketDataService {
 
   /**
    * Constructor

diff --git a/...vice/polling/ANXMarketDataServiceRaw.java → ...x/v2/service/ANXMarketDataServiceRaw.java b/...vice/polling/ANXMarketDataServiceRaw.java → ...x/v2/service/ANXMarketDataServiceRaw.java
@@ -1,4 +1,4 @@
-package org.knowm.xchange.anx.v2.service.polling;
+package org.knowm.xchange.anx.v2.service;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -22,7 +22,7 @@
 import si.mazi.rescu.HttpStatusIOException;
 import si.mazi.rescu.RestProxyFactory;
 
-public class ANXMarketDataServiceRaw extends ANXBasePollingService {
+public class ANXMarketDataServiceRaw extends ANXBaseService {
 
   private final ANXV2 anxV2;