Fixed project version in pom.xml's

SaschaZ · Jun 18, 2018 · cd072ae · cd072ae
1 parent 6becbb3
commit cd072ae
Show file tree

Hide file tree

Showing 80 changed files with 461 additions and 197 deletions.
diff --git a/xchange-abucoins/pom.xml b/xchange-abucoins/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>xchange-parent</artifactId>
         <groupId>org.knowm.xchange</groupId>
-        <version>4.3.8-SNAPSHOT</version>
+        <version>4.3.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>xchange-abucoins</artifactId>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.knowm.xchange</groupId>
             <artifactId>xchange-core</artifactId>
-            <version>4.3.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>

diff --git a/xchange-acx/pom.xml b/xchange-acx/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.knowm.xchange</groupId>
         <artifactId>xchange-parent</artifactId>
-        <version>4.3.8-SNAPSHOT</version>
+        <version>4.3.9-SNAPSHOT</version>
     </parent>
     <artifactId>xchange-acx</artifactId>
     <name>XChange ACX.IO</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.3.8-SNAPSHOT</version>
+        <version>4.3.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>xchange-anx</artifactId>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.knowm.xchange</groupId>
             <artifactId>xchange-core</artifactId>
-            <version>4.3.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Test dependencies -->

diff --git a/xchange-binance/pom.xml b/xchange-binance/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>xchange-parent</artifactId>
         <groupId>org.knowm.xchange</groupId>
-        <version>4.3.8-SNAPSHOT</version>
+        <version>4.3.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>xchange-binance</artifactId>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.knowm.xchange</groupId>
             <artifactId>xchange-core</artifactId>
-            <version>4.3.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/xchange-bitbay/pom.xml b/xchange-bitbay/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.knowm.xchange</groupId>
         <artifactId>xchange-parent</artifactId>
-        <version>4.3.8-SNAPSHOT</version>
+        <version>4.3.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>xchange-bitbay</artifactId>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.knowm.xchange</groupId>
             <artifactId>xchange-core</artifactId>
-            <version>4.3.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>

diff --git a/xchange-bitcoinaverage/pom.xml b/xchange-bitcoinaverage/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.knowm.xchange</groupId>
         <artifactId>xchange-parent</artifactId>
-        <version>4.3.8-SNAPSHOT</version>
+        <version>4.3.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>xchange-bitcoinaverage</artifactId>
@@ -27,9 +27,9 @@
         <dependency>
             <groupId>org.knowm.xchange</groupId>
             <artifactId>xchange-core</artifactId>
-            <version>4.3.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>
 
-</project>
+</project>
diff --git a/xchange-bitcoincharts/pom.xml b/xchange-bitcoincharts/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.knowm.xchange</groupId>
         <artifactId>xchange-parent</artifactId>
-        <version>4.3.8-SNAPSHOT</version>
+        <version>4.3.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>xchange-bitcoincharts</artifactId>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.knowm.xchange</groupId>
             <artifactId>xchange-core</artifactId>
-            <version>4.3.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>

diff --git a/xchange-bitcoincore/pom.xml b/xchange-bitcoincore/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.knowm.xchange</groupId>
         <artifactId>xchange-parent</artifactId>
-        <version>4.3.8-SNAPSHOT</version>
+        <version>4.3.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>xchange-bitcoincore</artifactId>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.knowm.xchange</groupId>
             <artifactId>xchange-core</artifactId>
-            <version>4.3.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/xchange-bitcoinde/pom.xml b/xchange-bitcoinde/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.knowm.xchange</groupId>
         <artifactId>xchange-parent</artifactId>
-        <version>4.3.8-SNAPSHOT</version>
+        <version>4.3.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>xchange-bitcoinde</artifactId>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.knowm.xchange</groupId>
             <artifactId>xchange-core</artifactId>
-            <version>4.3.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>

diff --git a/xchange-bitcoinium/pom.xml b/xchange-bitcoinium/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.knowm.xchange</groupId>
         <artifactId>xchange-parent</artifactId>
-        <version>4.3.8-SNAPSHOT</version>
+        <version>4.3.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>xchange-bitcoinium</artifactId>
@@ -27,9 +27,9 @@
         <dependency>
             <groupId>org.knowm.xchange</groupId>
             <artifactId>xchange-core</artifactId>
-            <version>4.3.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>
 
-</project>
+</project>
diff --git a/xchange-bitfinex/pom.xml b/xchange-bitfinex/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.knowm.xchange</groupId>
         <artifactId>xchange-parent</artifactId>
-        <version>4.3.8-SNAPSHOT</version>
+        <version>4.3.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>xchange-bitfinex</artifactId>
@@ -27,9 +27,9 @@
         <dependency>
             <groupId>org.knowm.xchange</groupId>
             <artifactId>xchange-core</artifactId>
-            <version>4.3.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>
 
-</project>
+</project>
diff --git a/xchange-bitflyer/pom.xml b/xchange-bitflyer/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>xchange-parent</artifactId>
         <groupId>org.knowm.xchange</groupId>
-        <version>4.3.8-SNAPSHOT</version>
+        <version>4.3.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,9 +22,9 @@
         <dependency>
             <groupId>org.knowm.xchange</groupId>
             <artifactId>xchange-core</artifactId>
-            <version>4.3.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>
 
-</project>
+</project>
diff --git a/xchange-bitmarket/pom.xml b/xchange-bitmarket/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.knowm.xchange</groupId>
         <artifactId>xchange-parent</artifactId>
-        <version>4.3.8-SNAPSHOT</version>
+        <version>4.3.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>xchange-bitmarket</artifactId>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.knowm.xchange</groupId>
             <artifactId>xchange-core</artifactId>
-            <version>4.3.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

diff --git a/xchange-bitmex/pom.xml b/xchange-bitmex/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.knowm.xchange</groupId>
         <artifactId>xchange-parent</artifactId>
-        <version>4.3.8-SNAPSHOT</version>
+        <version>4.3.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>xchange-bitmex</artifactId>
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>org.knowm.xchange</groupId>
             <artifactId>xchange-core</artifactId>
-            <version>4.3.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -37,4 +37,4 @@
             <version>19.0</version>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/xchange-bitmex/src/main/java/org/knowm/xchange/bitmex/Bitmex.java b/xchange-bitmex/src/main/java/org/knowm/xchange/bitmex/Bitmex.java
@@ -1,7 +1,9 @@
 package org.knowm.xchange.bitmex;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -184,6 +186,46 @@ BitmexPrivateOrder placeOrder(
       @Nullable @FormParam("clOrdID") String clOrdID,
       @Nullable @FormParam("execInst") String executionInstructions);
 
+  @POST
+  @Path("order/bulk")
+  //  @Consumes("application/json")
+  //  @Produces("application/json")
+  List<BitmexPrivateOrder> placeOrderBulk(
+      @HeaderParam("api-key") String apiKey,
+      @HeaderParam("api-expires") SynchronizedValueFactory<Long> nonce,
+      @HeaderParam("api-signature") ParamsDigest paramsDigest,
+      @FormParam("orders") String orderCommands);
+
+  public static class PlaceOrderCommand {
+    private @JsonProperty("symbol") String symbol;
+    private @Nullable @JsonProperty("side") String side;
+    private @JsonProperty("orderQty") int orderQuantity;
+    private @JsonProperty("price") BigDecimal price;
+    private @Nullable @JsonProperty("stopPx") BigDecimal stopPrice;
+    private @Nullable @JsonProperty("ordType") String orderType;
+    private @Nullable @JsonProperty("clOrdID") String clOrdID;
+    private @Nullable @JsonProperty("execInst") String executionInstructions;
+
+    public PlaceOrderCommand(
+        String symbol,
+        @Nullable String side,
+        int orderQuantity,
+        BigDecimal price,
+        @Nullable BigDecimal stopPrice,
+        @Nullable String orderType,
+        @Nullable String clOrdID,
+        @Nullable String executionInstructions) {
+      this.symbol = symbol;
+      this.side = side;
+      this.orderQuantity = orderQuantity;
+      this.price = price;
+      this.stopPrice = stopPrice;
+      this.orderType = orderType;
+      this.clOrdID = clOrdID;
+      this.executionInstructions = executionInstructions;
+    }
+  }
+
   @PUT
   @Path("order")
   // for some reason underlying library doesn't add contenty type for PUT requests automatically
@@ -200,6 +242,26 @@ BitmexPrivateOrder replaceOrder(
       @Nullable @FormParam("clOrdID") String clOrdID,
       @Nullable @FormParam("origClOrdID") String origClOrdID);
 
+  @PUT
+  @Path("order/bulk")
+  // for some reason underlying library doesn't add contenty type for PUT requests automatically
+  @Consumes("application/x-www-form-urlencoded")
+  BitmexPrivateOrder replaceOrderBulk(
+      @HeaderParam("api-key") String apiKey,
+      @HeaderParam("api-expires") SynchronizedValueFactory<Long> nonce,
+      @HeaderParam("api-signature") ParamsDigest paramsDigest,
+      @FormParam("orders") Collection<ReplaceOrderCommand> commands);
+
+  public static class ReplaceOrderCommand {
+    private @JsonProperty("orderQty") int orderQuantity;
+    private @Nullable @JsonProperty("price") BigDecimal price;
+    private @Nullable @JsonProperty("stopPx") BigDecimal stopPrice;
+    private @Nullable @JsonProperty("ordType") String orderType;
+    private @Nullable @JsonProperty("orderID") String orderId;
+    private @Nullable @JsonProperty("clOrdID") String clOrdID;
+    private @Nullable @JsonProperty("origClOrdID") String origClOrdID;
+  }
+
   @DELETE
   @Path("order")
   List<BitmexPrivateOrder> cancelOrder(

diff --git a/xchange-bitmex/src/main/java/org/knowm/xchange/bitmex/BitmexAdapters.java b/xchange-bitmex/src/main/java/org/knowm/xchange/bitmex/BitmexAdapters.java
@@ -367,7 +367,7 @@ public static OrderStatus adaptOrderStatus(BitmexPrivateOrder.OrderStatus status
     switch (status) {
       case New:
         return OrderStatus.NEW;
-      case Partially_filled:
+      case PartiallyFilled:
         return OrderStatus.PARTIALLY_FILLED;
       case Filled:
         return OrderStatus.FILLED;

diff --git a/xchange-bitmex/src/main/java/org/knowm/xchange/bitmex/dto/marketdata/BitmexPrivateOrder.java b/xchange-bitmex/src/main/java/org/knowm/xchange/bitmex/dto/marketdata/BitmexPrivateOrder.java
@@ -341,7 +341,7 @@ public String toString() {
 
   public enum OrderStatus {
     New,
-    Partially_filled,
+    PartiallyFilled,
     Filled,
     Canceled,
     Rejected