Merge pull request #5001 from bigscoop/bitmex

[bitmex] Extend implementation

Author: timmolter

xchange-bitmex/.gitignore

@@ -0,0 +1,5 @@
+# private properties for idea rest client
+http-client.private.env.json
+
+# private properties for integration tests
+integration-test.env.properties

xchange-bitmex/example.http-client.private.env.json

@@ -0,0 +1,6 @@
+{
+  "default": {
+    "api_key": "change_me",
+    "api_secret": "change_me",
+  }
+}

xchange-bitmex/example.integration-test.env.properties

@@ -0,0 +1,2 @@
+apiKey=change_me
+secretKey=change_me

xchange-bitmex/http-client.env.json

@@ -0,0 +1,8 @@
+{
+  "default": {
+    "api_v1": "https://www.bitmex.com/api/v1"
+  },
+  "testnet": {
+    "api_v1": "https://testnet.bitmex.com/api/v1"
+  }
+}

xchange-bitmex/lombok.config

@@ -0,0 +1,2 @@
+lombok.equalsAndHashCode.callSuper = call
+lombok.tostring.callsuper = call

xchange-bitmex/pom.xml

@@ -21,20 +21,47 @@
         <url>http://knowm.org/open-source/xchange/</url>
     </organization>
 
-    <!-- Parent provides default configuration for dependencies -->
     <dependencies>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- Project dependencies (version automatically set through parent) -->
         <dependency>
             <groupId>org.knowm.xchange</groupId>
             <artifactId>xchange-core</artifactId>
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
+
+    <build>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <configuration>
+                        <systemPropertiesFile>integration-test.env.properties</systemPropertiesFile>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+    </build>
+
 </project>

xchange-bitmex/src/main/java/org/knowm/xchange/bitmex/Bitmex.java

@@ -9,6 +9,7 @@
 import java.util.Date;
 import javax.annotation.Nullable;
 import org.knowm.xchange.bitmex.dto.account.BitmexTickerList;
+import org.knowm.xchange.bitmex.dto.marketdata.BitmexAsset;
 import org.knowm.xchange.bitmex.dto.marketdata.BitmexFundingList;
 import org.knowm.xchange.bitmex.dto.marketdata.BitmexKlineList;
 import org.knowm.xchange.bitmex.dto.marketdata.BitmexPublicOrderList;
@@ -41,7 +42,7 @@ BitmexKlineList getBucketedTrades(
   @GET
   @Path("orderBook/L2")
   BitmexPublicOrderList getDepth(
-      @QueryParam("symbol") String currencyPair, @QueryParam("depth") Double depth)
+      @QueryParam("symbol") String currencyPair, @QueryParam("depth") Integer depth)
       throws IOException, BitmexException;
 
   @GET
@@ -77,4 +78,9 @@ BitmexFundingList getFundingHistory(
       @Nullable @QueryParam("startTime") Date startTime,
       @Nullable @QueryParam("endTime") Date endTime)
       throws IOException, BitmexException;
+
+  @GET
+  @Path("wallet/assets")
+  HttpResponseAwareList<BitmexAsset> getAssets()
+      throws IOException, BitmexException;
 }