client request filter can enforce json media type,

getting rid of all the other ugly hack that would have done the same

api/src/main/java/at/outdated/bitcoin/exchange/api/client/RestExchangeClient.java

@@ -1,5 +1,6 @@
 package at.outdated.bitcoin.exchange.api.client;
 
+import at.outdated.bitcoin.exchange.api.jaxb.JsonEnforcingFilter;
 import at.outdated.bitcoin.exchange.api.market.*;
 
 import javax.json.Json;

api/src/main/java/at/outdated/bitcoin/exchange/api/jaxb/JsonEnforcingFilter.java

@@ -0,0 +1,23 @@
+package at.outdated.bitcoin.exchange.api.jaxb;
+
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+
+/**
+ * Created by ebirn on 21.01.14.
+ */
+
+public class JsonEnforcingFilter implements ClientResponseFilter {
+
+
+    @Override
+    public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
+
+        responseContext.getHeaders().putSingle("Content-Type", MediaType.APPLICATION_JSON);
+
+    }
+}

bitcurex/src/main/java/at/outdated/bitcoin/exchange/bitcurex/BitcurexApiClient.java

@@ -2,6 +2,7 @@
 
 import at.outdated.bitcoin.exchange.api.OrderId;
 import at.outdated.bitcoin.exchange.api.client.RestExchangeClient;
+import at.outdated.bitcoin.exchange.api.jaxb.JsonEnforcingFilter;
 import at.outdated.bitcoin.exchange.api.market.Market;
 import at.outdated.bitcoin.exchange.api.account.AccountInfo;
 import at.outdated.bitcoin.exchange.api.account.Wallet;
@@ -39,6 +40,8 @@ public class BitcurexApiClient extends RestExchangeClient {
     public BitcurexApiClient(Market market) {
         super(market);
 
+        client.register(JsonEnforcingFilter.class);
+
         tradeTarget = client.target("https://{quote}.bitcurex.com/api/0/");
         publicTarget = client.target("https://{quote}.bitcurex.com/data");
     }
@@ -136,17 +139,6 @@ public MarketDepth getMarketDepth(AssetPair asset) {
         return depth;
     }
 
-    @Override
-    protected <R> R simpleGetRequest(WebTarget resource, Class<R> resultClass) {
-        String resultStr =  super.simpleGetRequest(resource, String.class);
-
-        log.debug("BITCUREX raw: " + resultStr);
-
-        R result = BitcurexJsonResolver.convertFromJson(resultStr, resultClass);
-
-        return result;
-    }
-
     @Override
     public TickerValue getTicker(AssetPair asset) {
 

bitkonan/src/main/java/at/outdated/bitcoin/exchange/bitkonan/BitkonanApiClient.java

@@ -98,18 +98,6 @@ public MarketDepth getMarketDepth(AssetPair asset) {
         return depth;
     }
 
-    @Override
-    protected <R> R simpleGetRequest(WebTarget target, Class<R> resultClass) {
-
-        R result = null;
-
-        String resultStr = super.simpleGetRequest(target, String.class);
-
-        result = BitkonanJsonResolver.convertFromJson(resultStr, resultClass);
-
-        return result;
-    }
-
     @Override
     public TickerValue getTicker(AssetPair asset) {
 

btc-e/src/main/java/at/outdated/bitcoin/exchange/btce/BtcEApiClient.java

@@ -2,6 +2,7 @@
 
 import at.outdated.bitcoin.exchange.api.OrderId;
 import at.outdated.bitcoin.exchange.api.client.RestExchangeClient;
+import at.outdated.bitcoin.exchange.api.jaxb.JsonEnforcingFilter;
 import at.outdated.bitcoin.exchange.api.market.Market;
 import at.outdated.bitcoin.exchange.api.account.AccountInfo;
 import at.outdated.bitcoin.exchange.api.currency.Currency;
@@ -37,8 +38,10 @@ public class BtcEApiClient extends RestExchangeClient {
 
     public BtcEApiClient(Market market) {
         super(market);
+        client.register(JsonEnforcingFilter.class);
 
         tradeFee = new SimplePercentageFee("0.002");
+
     }
 
     @Override
@@ -53,15 +56,13 @@ public AccountInfo getAccountInfo() {
 
         data = new MultivaluedHashMap<>();
         data.add("method", "getInfo");
-        String raw = protectedPostRequest(tgt, String.class, Entity.form(data));
-        //log.debug("raw info: {}", raw);
-        InfoResponse infoRes = BtcEJsonResolver.convertFromJson(raw, InfoResponse.class);
+        InfoResponse infoRes = protectedPostRequest(tgt, InfoResponse.class, Entity.form(data));
 
         AccountInfo info = infoRes.result;
 
         data = new MultivaluedHashMap<>();
         data.add("method", "TransHistory");
-        raw = protectedPostRequest(tgt, String.class, Entity.form(data));
+        String raw = protectedPostRequest(tgt, String.class, Entity.form(data));
 
         //log.debug("raw transactions: {}", raw);
         JsonObject transResponse = jsonFromString(raw);
@@ -170,20 +171,6 @@ public MarketDepth getMarketDepth(AssetPair asset) {
         return depth;
     }
 
-
-    @Override
-    protected <R> R simpleGetRequest(WebTarget target, Class<R> resultClass) {
-
-        R result = null;
-
-        String resultStr = super.simpleGetRequest(target, String.class);
-
-        //log.debug("BTC-E raw: " + resultStr);
-        result = BtcEJsonResolver.convertFromJson(resultStr, resultClass);
-
-        return result;
-    }
-
     @Override
     public TickerValue getTicker(AssetPair asset) {
 

kraken/kraken.iml

@@ -4,10 +4,10 @@
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

mtgox/src/main/java/at/outdated/bitcoin/exchange/mtgox/MtGoxClient.java

@@ -61,10 +61,8 @@ public class MtGoxClient extends RestExchangeClient {
 
     public MtGoxClient(Market market) {
         super(market);
-        client = ClientBuilder.newBuilder().register(MtGoxJSONResolver.class).build();
         apiBaseResource = client.target(API_BASE_URL);
 
-
         multiplier.put(Currency.BTC, new BigDecimal("1.0e8", CurrencyValue.CURRENCY_MATH_CONTEXT));
         multiplier.put(Currency.USD, new BigDecimal("1.0e5", CurrencyValue.CURRENCY_MATH_CONTEXT));
         multiplier.put(Currency.EUR, new BigDecimal("1.0e5", CurrencyValue.CURRENCY_MATH_CONTEXT));