Merge pull request #23 from PlayFab/master

Pushing new version

Author: Paul Gilmore

PlayFabClientSDK/src/playfab/PlayFabClientAPI.java

@@ -3221,7 +3221,7 @@ private static PlayFabResult<PurchaseItemResult> privatePurchaseItemAsync(Purcha
         return pfResult;
     }
     /**
-     * Adds the virtual goods associated with the coupon to the user's inventory. Coupons can be generated  via the Promotions->Coupons tab in the PlayFab Game Manager. See this post for more information on coupons:  https://playfab.com/blog/2015/06/18/using-stores-and-coupons-game-manager
+     * Adds the virtual goods associated with the coupon to the user's inventory. Coupons can be generated  via the Promotions->Coupons tab in the PlayFab Game Manager. See this post for more information on coupons:  https://playfab.com/blog/using-stores-and-coupons-game-manager/
      */
     public static FutureTask<PlayFabResult<RedeemCouponResult>> RedeemCouponAsync(RedeemCouponRequest request) {
         return new FutureTask(new Callable<PlayFabResult<RedeemCouponResult>>() {
@@ -3232,7 +3232,7 @@ public PlayFabResult<RedeemCouponResult> call() throws Exception {
     }
 
     /**
-     * Adds the virtual goods associated with the coupon to the user's inventory. Coupons can be generated  via the Promotions->Coupons tab in the PlayFab Game Manager. See this post for more information on coupons:  https://playfab.com/blog/2015/06/18/using-stores-and-coupons-game-manager
+     * Adds the virtual goods associated with the coupon to the user's inventory. Coupons can be generated  via the Promotions->Coupons tab in the PlayFab Game Manager. See this post for more information on coupons:  https://playfab.com/blog/using-stores-and-coupons-game-manager/
      */
     public static PlayFabResult<RedeemCouponResult> RedeemCoupon(RedeemCouponRequest request) {
         FutureTask<PlayFabResult<RedeemCouponResult>> task = new FutureTask(new Callable<PlayFabResult<RedeemCouponResult>>() {
@@ -3249,7 +3249,7 @@ public PlayFabResult<RedeemCouponResult> call() throws Exception {
     }
 
     /**
-     * Adds the virtual goods associated with the coupon to the user's inventory. Coupons can be generated  via the Promotions->Coupons tab in the PlayFab Game Manager. See this post for more information on coupons:  https://playfab.com/blog/2015/06/18/using-stores-and-coupons-game-manager
+     * Adds the virtual goods associated with the coupon to the user's inventory. Coupons can be generated  via the Promotions->Coupons tab in the PlayFab Game Manager. See this post for more information on coupons:  https://playfab.com/blog/using-stores-and-coupons-game-manager/
      */
     private static PlayFabResult<RedeemCouponResult> privateRedeemCouponAsync(RedeemCouponRequest request) throws Exception {
         if (AuthKey == null) throw new Exception ("Must be logged in to call this method");

PlayFabClientSDK/src/playfab/PlayFabClientModels.java

@@ -2912,6 +2912,10 @@ public static class UpdateCharacterDataRequest {
          * Data to be written to the user's character's custom data. Note that keys are trimmed of whitespace, are limited to 1024 characters, and may not begin with a '!' character.
          */
         public Map<String,String> Data;
+        /**
+         * Optional list of Data-keys to remove from CharacterData.  Some SDKs cannot insert null-values into Data due to language constraints.  Use this to delete the keys directly.
+         */
+        public ArrayList<String> KeysToRemove;
         /**
          * Permission to be applied to all user data keys written in this request. Defaults to "private" if not set.
          */
@@ -2936,6 +2940,10 @@ public static class UpdateSharedGroupDataRequest {
          * Key value pairs to be stored in the shared group - note that keys will be trimmed of whitespace, must not begin with a '!' character, and that null values will result in the removal of the key from the data set.
          */
         public Map<String,String> Data;
+        /**
+         * Optional list of Data-keys to remove from GroupData.  Some SDKs cannot insert null-values into Data due to language constraints.  Use this to delete the keys directly.
+         */
+        public ArrayList<String> KeysToRemove;
         /**
          * Permission to be applied to all user data keys in this request.
          */
@@ -2952,6 +2960,10 @@ public static class UpdateUserDataRequest {
          * Data to be written to the user's custom data. Note that keys are trimmed of whitespace, are limited to 1024 characters, and may not begin with a '!' character.
          */
         public Map<String,String> Data;
+        /**
+         * Optional list of Data-keys to remove from UserData.  Some SDKs cannot insert null-values into Data due to language constraints.  Use this to delete the keys directly.
+         */
+        public ArrayList<String> KeysToRemove;
         /**
          * Permission to be applied to all user data keys written in this request. Defaults to "private" if not set.
          */

PlayFabClientSDK/src/playfab/PlayFabErrors.java

@@ -186,7 +186,9 @@ public static enum PlayFabErrorCode {
         TradeAcceptedCatalogItemIsNotTradable(1182),
         UsersAlreadyFriends(1183),
         LinkedIdentifierAlreadyClaimed(1184),
-        CustomIdNotLinked(1185);
+        CustomIdNotLinked(1185),
+        TotalDataSizeExceeded(1186),
+        DeleteKeyConflict(1187);
 
         public int id;
 

PlayFabClientSDK/src/playfab/internal/PlayFabVersion.java

@@ -1,8 +1,8 @@
 package playfab.internal;
 
 public class PlayFabVersion {
-    public static String ApiRevision = "1.7.20151019";
-    public static String SdkRevision = "1.0.2";
+    public static String ApiRevision = "1.9.20151109";
+    public static String SdkRevision = "0.7.151109";
     public static String getVersionString() {
         return "JavaSDK-" + SdkRevision + "-" + ApiRevision;
     }

PlayFabSDK/src/playfab/PlayFabAdminModels.java

@@ -1679,6 +1679,10 @@ public static class UpdateUserDataRequest {
          * Data to be written to the user's custom data. Note that keys are trimmed of whitespace, are limited to 1024 characters, and may not begin with a '!' character.
          */
         public Map<String,String> Data;
+        /**
+         * Optional list of Data-keys to remove from UserData.  Some SDKs cannot insert null-values into Data due to language constraints.  Use this to delete the keys directly.
+         */
+        public ArrayList<String> KeysToRemove;
         /**
          * Permission to be applied to all user data keys written in this request. Defaults to "private" if not set.
          */
@@ -1703,6 +1707,10 @@ public static class UpdateUserInternalDataRequest {
          * Data to be written to the user's custom data.
          */
         public Map<String,String> Data;
+        /**
+         * Optional list of Data-keys to remove from UserData.  Some SDKs cannot insert null-values into Data due to language constraints.  Use this to delete the keys directly.
+         */
+        public ArrayList<String> KeysToRemove;
 
     }
 

PlayFabSDK/src/playfab/PlayFabClientAPI.java

@@ -3221,7 +3221,7 @@ private static PlayFabResult<PurchaseItemResult> privatePurchaseItemAsync(Purcha
         return pfResult;
     }
     /**
-     * Adds the virtual goods associated with the coupon to the user's inventory. Coupons can be generated  via the Promotions->Coupons tab in the PlayFab Game Manager. See this post for more information on coupons:  https://playfab.com/blog/2015/06/18/using-stores-and-coupons-game-manager
+     * Adds the virtual goods associated with the coupon to the user's inventory. Coupons can be generated  via the Promotions->Coupons tab in the PlayFab Game Manager. See this post for more information on coupons:  https://playfab.com/blog/using-stores-and-coupons-game-manager/
      */
     public static FutureTask<PlayFabResult<RedeemCouponResult>> RedeemCouponAsync(RedeemCouponRequest request) {
         return new FutureTask(new Callable<PlayFabResult<RedeemCouponResult>>() {
@@ -3232,7 +3232,7 @@ public PlayFabResult<RedeemCouponResult> call() throws Exception {
     }
 
     /**
-     * Adds the virtual goods associated with the coupon to the user's inventory. Coupons can be generated  via the Promotions->Coupons tab in the PlayFab Game Manager. See this post for more information on coupons:  https://playfab.com/blog/2015/06/18/using-stores-and-coupons-game-manager
+     * Adds the virtual goods associated with the coupon to the user's inventory. Coupons can be generated  via the Promotions->Coupons tab in the PlayFab Game Manager. See this post for more information on coupons:  https://playfab.com/blog/using-stores-and-coupons-game-manager/
      */
     public static PlayFabResult<RedeemCouponResult> RedeemCoupon(RedeemCouponRequest request) {
         FutureTask<PlayFabResult<RedeemCouponResult>> task = new FutureTask(new Callable<PlayFabResult<RedeemCouponResult>>() {
@@ -3249,7 +3249,7 @@ public PlayFabResult<RedeemCouponResult> call() throws Exception {
     }
 
     /**
-     * Adds the virtual goods associated with the coupon to the user's inventory. Coupons can be generated  via the Promotions->Coupons tab in the PlayFab Game Manager. See this post for more information on coupons:  https://playfab.com/blog/2015/06/18/using-stores-and-coupons-game-manager
+     * Adds the virtual goods associated with the coupon to the user's inventory. Coupons can be generated  via the Promotions->Coupons tab in the PlayFab Game Manager. See this post for more information on coupons:  https://playfab.com/blog/using-stores-and-coupons-game-manager/
      */
     private static PlayFabResult<RedeemCouponResult> privateRedeemCouponAsync(RedeemCouponRequest request) throws Exception {
         if (AuthKey == null) throw new Exception ("Must be logged in to call this method");

PlayFabSDK/src/playfab/PlayFabClientModels.java

@@ -2912,6 +2912,10 @@ public static class UpdateCharacterDataRequest {
          * Data to be written to the user's character's custom data. Note that keys are trimmed of whitespace, are limited to 1024 characters, and may not begin with a '!' character.
          */
         public Map<String,String> Data;
+        /**
+         * Optional list of Data-keys to remove from CharacterData.  Some SDKs cannot insert null-values into Data due to language constraints.  Use this to delete the keys directly.
+         */
+        public ArrayList<String> KeysToRemove;
         /**
          * Permission to be applied to all user data keys written in this request. Defaults to "private" if not set.
          */
@@ -2936,6 +2940,10 @@ public static class UpdateSharedGroupDataRequest {
          * Key value pairs to be stored in the shared group - note that keys will be trimmed of whitespace, must not begin with a '!' character, and that null values will result in the removal of the key from the data set.
          */
         public Map<String,String> Data;
+        /**
+         * Optional list of Data-keys to remove from GroupData.  Some SDKs cannot insert null-values into Data due to language constraints.  Use this to delete the keys directly.
+         */
+        public ArrayList<String> KeysToRemove;
         /**
          * Permission to be applied to all user data keys in this request.
          */
@@ -2952,6 +2960,10 @@ public static class UpdateUserDataRequest {
          * Data to be written to the user's custom data. Note that keys are trimmed of whitespace, are limited to 1024 characters, and may not begin with a '!' character.
          */
         public Map<String,String> Data;
+        /**
+         * Optional list of Data-keys to remove from UserData.  Some SDKs cannot insert null-values into Data due to language constraints.  Use this to delete the keys directly.
+         */
+        public ArrayList<String> KeysToRemove;
         /**
          * Permission to be applied to all user data keys written in this request. Defaults to "private" if not set.
          */

PlayFabSDK/src/playfab/PlayFabErrors.java

@@ -186,7 +186,9 @@ public static enum PlayFabErrorCode {
         TradeAcceptedCatalogItemIsNotTradable(1182),
         UsersAlreadyFriends(1183),
         LinkedIdentifierAlreadyClaimed(1184),
-        CustomIdNotLinked(1185);
+        CustomIdNotLinked(1185),
+        TotalDataSizeExceeded(1186),
+        DeleteKeyConflict(1187);
 
         public int id;
 

PlayFabSDK/src/playfab/PlayFabServerAPI.java

@@ -2013,6 +2013,60 @@ private static PlayFabResult<MoveItemToUserFromCharacterResult> privateMoveItemT
         pfResult.Result = result;
         return pfResult;
     }
+    /**
+     * Adds the virtual goods associated with the coupon to the user's inventory. Coupons can be generated  via the Promotions->Coupons tab in the PlayFab Game Manager. See this post for more information on coupons:  https://playfab.com/blog/2015/06/18/using-stores-and-coupons-game-manager
+     */
+    public static FutureTask<PlayFabResult<RedeemCouponResult>> RedeemCouponAsync(RedeemCouponRequest request) {
+        return new FutureTask(new Callable<PlayFabResult<RedeemCouponResult>>() {
+            public PlayFabResult<RedeemCouponResult> call() throws Exception {
+                return privateRedeemCouponAsync(request);
+            }
+        });
+    }
+
+    /**
+     * Adds the virtual goods associated with the coupon to the user's inventory. Coupons can be generated  via the Promotions->Coupons tab in the PlayFab Game Manager. See this post for more information on coupons:  https://playfab.com/blog/2015/06/18/using-stores-and-coupons-game-manager
+     */
+    public static PlayFabResult<RedeemCouponResult> RedeemCoupon(RedeemCouponRequest request) {
+        FutureTask<PlayFabResult<RedeemCouponResult>> task = new FutureTask(new Callable<PlayFabResult<RedeemCouponResult>>() {
+            public PlayFabResult<RedeemCouponResult> call() throws Exception {
+                return privateRedeemCouponAsync(request);
+            }
+        });
+        try {
+            task.run();
+            return task.get();
+        } catch(Exception e) {
+            return null;
+        }
+    }
+    
+    /**
+     * Adds the virtual goods associated with the coupon to the user's inventory. Coupons can be generated  via the Promotions->Coupons tab in the PlayFab Game Manager. See this post for more information on coupons:  https://playfab.com/blog/2015/06/18/using-stores-and-coupons-game-manager
+     */
+    private static PlayFabResult<RedeemCouponResult> privateRedeemCouponAsync(RedeemCouponRequest request) throws Exception {
+        if (PlayFabSettings.DeveloperSecretKey == null) throw new Exception ("Must have PlayFabSettings.DeveloperSecretKey set to call this method");
+
+        FutureTask<Object> task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Server/RedeemCoupon", request, "X-SecretKey", PlayFabSettings.DeveloperSecretKey);
+        task.run();
+        Object httpResult = task.get();
+        if(httpResult instanceof PlayFabError) {
+            PlayFabError error = (PlayFabError)httpResult;
+            if (PlayFabSettings.GlobalErrorHandler != null)
+                PlayFabSettings.GlobalErrorHandler.callback(error);
+            PlayFabResult result = new PlayFabResult<RedeemCouponResult>();
+            result.Error = error;
+            return result;
+        }
+        String resultRawJson = (String) httpResult;
+        
+        PlayFabJsonSuccess<RedeemCouponResult> resultData = gson.fromJson(resultRawJson, new TypeToken<PlayFabJsonSuccess<RedeemCouponResult>>(){}.getType()); 
+        RedeemCouponResult result = resultData.data;
+        
+        PlayFabResult<RedeemCouponResult> pfResult = new PlayFabResult<RedeemCouponResult>();
+        pfResult.Result = result;
+        return pfResult;
+    }
     /**
      * Submit a report about a player (due to bad bahavior, etc.) on behalf of another player, so that customer service representatives for the title can take action concerning potentially poxic players.
      */

PlayFabSDK/src/playfab/PlayFabServerModels.java

@@ -1587,6 +1587,30 @@ public static class PlayerLeaderboardEntry {
 
     }
 
+    public static class RedeemCouponRequest {
+        /**
+         * Generated coupon code to redeem.
+         */
+        public String CouponCode;
+        /**
+         * Unique PlayFab assigned ID of the user on whom the operation will be performed.
+         */
+        public String PlayFabId;
+        /**
+         * Catalog version of the coupon.
+         */
+        public String CatalogVersion;
+        
+    }
+
+    public static class RedeemCouponResult {
+        /**
+         * Items granted to the player as a result of redeeming the coupon.
+         */
+        public ArrayList<ItemInstance> GrantedItems;
+        
+    }
+
     public static class RedeemMatchmakerTicketRequest {
         /**
          * Server authorization ticket passed back from a call to Matchmake or StartGame.
@@ -1621,7 +1645,7 @@ public static class RemoveFriendRequest {
          */
         public String FriendPlayFabId;
         /**
-         * The PlayFab identifier of the player to lose a friend
+         * Unique PlayFab assigned ID of the user on whom the operation will be performed.
          */
         public String PlayFabId;
 
@@ -1818,6 +1842,10 @@ public static class UpdateCharacterDataRequest {
          * Data to be written to the user's character's custom data. Note that keys are trimmed of whitespace, are limited to 1024 characters, and may not begin with a '!' character.
          */
         public Map<String,String> Data;
+        /**
+         * Optional list of Data-keys to remove from CharacterData.  Some SDKs cannot insert null-values into Data due to language constraints.  Use this to delete the keys directly.
+         */
+        public ArrayList<String> KeysToRemove;
         /**
          * Permission to be applied to all user data keys written in this request. Defaults to "private" if not set.
          */
@@ -1862,6 +1890,10 @@ public static class UpdateSharedGroupDataRequest {
          * Key value pairs to be stored in the shared group - note that keys will be trimmed of whitespace, must not begin with a '!' character, and that null values will result in the removal of the key from the data set.
          */
         public Map<String,String> Data;
+        /**
+         * Optional list of Data-keys to remove from GroupData.  Some SDKs cannot insert null-values into Data due to language constraints.  Use this to delete the keys directly.
+         */
+        public ArrayList<String> KeysToRemove;
         /**
          * Permission to be applied to all user data keys in this request.
          */
@@ -1882,6 +1914,10 @@ public static class UpdateUserDataRequest {
          * Data to be written to the user's custom data. Note that keys are trimmed of whitespace, are limited to 1024 characters, and may not begin with a '!' character.
          */
         public Map<String,String> Data;
+        /**
+         * Optional list of Data-keys to remove from UserData.  Some SDKs cannot insert null-values into Data due to language constraints.  Use this to delete the keys directly.
+         */
+        public ArrayList<String> KeysToRemove;
         /**
          * Permission to be applied to all user data keys written in this request. Defaults to "private" if not set.
          */
@@ -1906,6 +1942,10 @@ public static class UpdateUserInternalDataRequest {
          * Data to be written to the user's custom data.
          */
         public Map<String,String> Data;
+        /**
+         * Optional list of Data-keys to remove from UserData.  Some SDKs cannot insert null-values into Data due to language constraints.  Use this to delete the keys directly.
+         */
+        public ArrayList<String> KeysToRemove;
 
     }
 
@@ -1926,6 +1966,10 @@ public static class UpdateUserInventoryItemDataRequest {
          * Data to be written to the item's custom data. Note that keys are trimmed of whitespace.
          */
         public Map<String,String> Data;
+        /**
+         * Optional list of Data-keys to remove from ItemData.  Some SDKs cannot insert null-values into Data due to language constraints.  Use this to delete the keys directly.
+         */
+        public ArrayList<String> KeysToRemove;
 
     }