add *byIndex() methods

anovikov1984 · anovikov1984 · commit fe25e6e4ca25 · 2015-01-08T01:43:24.000-08:00
diff --git a/java/srcPubnubApi/com/pubnub/api/SyncedObject.java b/java/srcPubnubApi/com/pubnub/api/SyncedObject.java
@@ -7,6 +7,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class SyncedObject {
@@ -149,6 +150,75 @@ public Object shift() {
         }
     }
 
+    public Object removeByIndex(Integer index) {
+        String key = _keyByIndex(index);
+
+        if (_keyByIndex(index) != null) {
+            try {
+                Object result = syncedObjectManager.getValue(glue(location, key));
+                remove(key);
+                return result;
+            } catch (JSONException e) {
+                return null;
+            }
+        } else {
+            return null;
+        }
+    }
+
+    public Object replaceByIndex(Integer index, Object data) {
+        String key = _keyByIndex(index);
+
+        if (_keyByIndex(index) != null) {
+            try {
+                Object result = syncedObjectManager.getValue(glue(location, key));
+                replace(key, data);
+                return result;
+            } catch (JSONException e) {
+                return null;
+            }
+        } else {
+            return null;
+        }
+    }
+
+    public Object getByIndex(Integer index) {
+        String key = _keyByIndex(index);
+
+        if (_keyByIndex(index) != null) {
+            try {
+                return syncedObjectManager.getValue(glue(location, key));
+            } catch (JSONException e) {
+                return null;
+            }
+        } else {
+            return null;
+        }
+    }
+
+    private String _keyByIndex(Integer index) {
+        try {
+            JSONObject value = syncedObjectManager.getRawValue(location);
+            if (isPnList(value)) {
+                Integer i = 0;
+                Iterator valueIterator = value.sortedKeys();
+                while (valueIterator.hasNext()) {
+                    if (index.equals(i)) {
+                        return (String) valueIterator.next();
+                    } else {
+                        valueIterator.next();
+                        i++;
+                    }
+                }
+                return null;
+            } else {
+                return null;
+            }
+        } catch (JSONException e) {
+            return null;
+        }
+    }
+
     public String getType() {
         return getType("");
     }
diff --git a/java/srcTest/com/pubnub/api/datasync/ListMethodsTest.java b/java/srcTest/com/pubnub/api/datasync/ListMethodsTest.java
@@ -1,9 +1,6 @@
 package com.pubnub.api.datasync;
 
-import com.pubnub.api.DataSyncCallback;
-import com.pubnub.api.Pubnub;
-import com.pubnub.api.SyncedObject;
-import com.pubnub.api.TestHelper;
+import com.pubnub.api.*;
 import org.json.JSONException;
 import org.junit.Before;
 import org.junit.Test;
@@ -97,4 +94,79 @@ public void removeCallback(List updates, String path) {
         assertEquals(0, latch1.getCount());
         assertEquals(0, latch2.getCount());
     }
+
+    @Test
+    public void testRemoveByIndex() throws InterruptedException, JSONException {
+        DataSyncTestHelper.setupSettingsOn(playerString, pubnub, true);
+
+        final CountDownLatch latch1 = new CountDownLatch(1);
+        final CountDownLatch latch2 = new CountDownLatch(1);
+
+        DataSyncCallback cb1 = new DataSyncCallback() {
+            @Override
+            public void readyCallback(SyncedObject syncedObject) {
+                latch1.countDown();
+            }
+
+            @Override
+            public void removeCallback(List updates, String path) {
+                latch2.countDown();
+            }
+        };
+
+        SyncedObject player = pubnub.sync(playerString, cb1);
+
+        latch1.await(5, TimeUnit.SECONDS);
+
+        SyncedObject tracks = player.child("tracks");
+        assertEquals(3, tracks.getList().size());
+
+        String track = (String) tracks.removeByIndex(1);
+        assertEquals("track#2", track);
+
+        latch2.await(5, TimeUnit.SECONDS);
+
+        assertEquals(2, tracks.getList().size());
+        assertEquals("track#3", tracks.getByIndex(1));
+        assertEquals(0, latch1.getCount());
+        assertEquals(0, latch2.getCount());
+    }
+
+    @Test
+    public void testReplaceByIndex() throws InterruptedException, JSONException {
+        DataSyncTestHelper.setupSettingsOn(playerString, pubnub, true);
+
+        final CountDownLatch latch1 = new CountDownLatch(1);
+        final CountDownLatch latch2 = new CountDownLatch(1);
+
+        TestHelper.SimpleDataSyncCallback cb1 = new TestHelper.SimpleDataSyncCallback() {
+            @Override
+            public void readyCallback(SyncedObject syncedObject) {
+                latch1.countDown();
+            }
+
+            @Override
+            public void replaceCallback(List updates, String path) {
+                result = updates;
+                latch2.countDown();
+            }
+        };
+
+        SyncedObject player = pubnub.sync(playerString, cb1);
+
+        latch1.await(5, TimeUnit.SECONDS);
+
+        SyncedObject tracks = player.child("tracks");
+        String track2 = (String) tracks.replaceByIndex(1, "hi");
+        assertEquals("track#2", track2);
+
+        latch2.await(5, TimeUnit.SECONDS);
+        List updates = (List) cb1.getResult();
+        assertEquals(1, updates.size());
+        assertEquals("hi", ((SyncedObjectDelta) updates.get(0)).getValue());
+        assertEquals("hi", tracks.getByIndex(1));
+
+        assertEquals(Integer.valueOf(3), tracks.size());
+        assertEquals(0, latch1.getCount());
+    }
 }
