Merge branch 'master' of https://github.com/betfair/API-NG-sample-code

Dasmeet Doowa · Dasmeet Doowa · commit 7f11d9fe458f · 2014-06-26T14:02:11.000+01:00
diff --git a/README.md b/README.md
@@ -1,6 +1,9 @@
-# Betfair API-NG Code Samples
+Betfair API-NG Code Samples
+===============================
 
-This github respository contains sample code in various languages to help customers get started with writing betfair API-NG clients.   
+This github respository contains sample code in various languages to help customers get started with writing betfair API-NG clients. For more information about API-NG please see [Getting started with API-NG documentation](https://api.developer.betfair.com/services/webapps/docs/display/1smk3cen4v3lu3yomq5qye0ni/Getting+Started+with+API-NG) and [developer.betfair.com](http://developer.betfair.com).
+
+Please note, these are not intended to be fully fledged clients and all follow an identical set of scenarios. As a result, we do not wish to extend the samples with pull requests that extend only a single language sample or add functionality not in the below scenarios.
 
 Each of the basic language samples demonstrates a basic use case of placing a bet on the next GB Horse Racing market:
 
@@ -11,7 +14,7 @@ Each of the basic language samples demonstrates a basic use case of placing a be
 
 For the sake of simplictity and ease of understanding, these samples are not intended to show best practice for optimisations for speed or throughput. 
 
-A comprehensive description of the samples can be found <a href="http://my.developer.betfair.com/">here.</a>
+A comprehensive description of the samples can be found in the [developer samples documentation](https://api.developer.betfair.com/services/webapps/docs/display/1smk3cen4v3lu3yomq5qye0ni/Sample+Code).
 
 There is also a limited sample of login examples within the loginCode subdirectory and an Android sample app in the android subdirectory.
 
diff --git a/java/ng/src/main/java/com/betfair/aping/ApiNGJRescriptDemo.java b/java/ng/src/main/java/com/betfair/aping/ApiNGJRescriptDemo.java
@@ -90,6 +90,7 @@ public void start(String appKey, String ssoid) {
             PriceProjection priceProjection = new PriceProjection();
             Set<PriceData> priceData = new HashSet<PriceData>();
             priceData.add(PriceData.EX_BEST_OFFERS);
+            priceProjection.setPriceData(priceData);
 
             //In this case we don't need these objects so they are declared null
             OrderProjection orderProjection = null;
diff --git a/java/ng/src/main/java/com/betfair/aping/ApiNGJsonRpcDemo.java b/java/ng/src/main/java/com/betfair/aping/ApiNGJsonRpcDemo.java
@@ -90,6 +90,7 @@ public void start(String appKey, String ssoid) {
             PriceProjection priceProjection = new PriceProjection();
             Set<PriceData> priceData = new HashSet<PriceData>();
             priceData.add(PriceData.EX_BEST_OFFERS);
+            priceProjection.setPriceData(priceData);
 
             //In this case we don't need these objects so they are declared null
             OrderProjection orderProjection = null;
diff --git a/java/ng/src/main/java/com/betfair/aping/api/ApiNgJsonRpcOperations.java b/java/ng/src/main/java/com/betfair/aping/api/ApiNgJsonRpcOperations.java
@@ -51,6 +51,9 @@ public List<MarketBook> listMarketBook(List<String> marketIds, PriceProjection p
         Map<String, Object> params = new HashMap<String, Object>();
         params.put(LOCALE, locale);
         params.put(MARKET_IDS, marketIds);
+        params.put(PRICE_PROJECTION, priceProjection);
+        params.put(ORDER_PROJECTION, orderProjection);
+        params.put(MATCH_PROJECTION, matchProjection);
         String result = getInstance().makeRequest(ApiNgOperation.LISTMARKETBOOK.getOperationName(), params, appKey, ssoId);
         if(ApiNGDemo.isDebug())
             System.out.println("\nResponse: "+result);
diff --git a/java/ng/src/main/java/com/betfair/aping/api/ApiNgOperations.java b/java/ng/src/main/java/com/betfair/aping/api/ApiNgOperations.java
@@ -29,6 +29,9 @@ public abstract class ApiNgOperations {
     protected final String INSTRUCTIONS = "instructions";
     protected final String CUSTOMER_REF = "customerRef";
     protected final String MARKET_PROJECTION = "marketProjection";
+    protected final String PRICE_PROJECTION = "priceProjection";
+    protected final String MATCH_PROJECTION = "matchProjection";
+    protected final String ORDER_PROJECTION = "orderProjection";
     protected final String locale = Locale.getDefault().toString();
 
 	public abstract List<EventTypeResult> listEventTypes(MarketFilter filter, String appKey, String ssoId) throws APINGException;
diff --git a/java/ng/src/main/java/com/betfair/aping/api/ApiNgRescriptOperations.java b/java/ng/src/main/java/com/betfair/aping/api/ApiNgRescriptOperations.java
@@ -45,6 +45,9 @@ public List<MarketBook> listMarketBook(List<String> marketIds, PriceProjection p
         Map<String, Object> params = new HashMap<String, Object>();
         params.put(LOCALE, locale);
         params.put(MARKET_IDS, marketIds);
+        params.put(PRICE_PROJECTION, priceProjection);
+        params.put(ORDER_PROJECTION, orderProjection);
+        params.put(MATCH_PROJECTION, matchProjection);
         String result = getInstance().makeRequest(ApiNgOperation.LISTMARKETBOOK.getOperationName(), params, appKey, ssoId);
         if(ApiNGDemo.isDebug())
             System.out.println("\nResponse: "+result);
@@ -62,6 +65,7 @@ public List<MarketCatalogue> listMarketCatalogue(MarketFilter filter, Set<Market
         params.put(FILTER, filter);
         params.put(SORT, sort);
         params.put(MAX_RESULT, maxResult);
+        params.put(MARKET_PROJECTION, marketProjection);
         String result = getInstance().makeRequest(ApiNgOperation.LISTMARKETCATALOGUE.getOperationName(), params, appKey, ssoId);
         if(ApiNGDemo.isDebug())
             System.out.println("\nResponse: "+result);
diff --git a/java/ng/src/main/java/com/betfair/aping/containers/CompetitionResultContainer.java b/java/ng/src/main/java/com/betfair/aping/containers/CompetitionResultContainer.java
