Fixed #1475 - 2.0 API update (#1476)

Document.set(), Dictionary.setDictionary(), Array.setArray -> setData

Author: Hideki Itakura

android/CouchbaseLite/src/androidTest/java/com/couchbase/lite/ArrayTest.java

@@ -153,7 +153,7 @@ public void testSetArrayList() throws CouchbaseLiteException {
         data.add("2");
         data.add("3");
         MutableArray array = new MutableArray();
-        array.set(data);
+        array.setData(data);
         assertEquals(3, array.count());
         assertEquals(data, array.toList());
 
@@ -171,7 +171,7 @@ public void testSetArrayList() throws CouchbaseLiteException {
         data.add("4");
         data.add("5");
         data.add("6");
-        array.set(data);
+        array.setData(data);
 
         assertEquals(data.size(), array.count());
         assertEquals(data, array.toList());

android/CouchbaseLite/src/androidTest/java/com/couchbase/lite/BaseTest.java

@@ -148,7 +148,7 @@ protected void loadJSONResource(String name) throws Exception {
             Map<String, Object> props = JsonUtils.fromJson(json);
             String docId = String.format(Locale.ENGLISH, "doc-%03d", n);
             MutableDocument doc = createDocument(docId);
-            doc.set(props);
+            doc.setData(props);
             save(doc);
         }
     }

android/CouchbaseLite/src/androidTest/java/com/couchbase/lite/DocumentTest.java

@@ -256,7 +256,7 @@ public void testSetDictionaryContent() throws CouchbaseLiteException {
         dict.put("phones", Arrays.asList("650-123-0001", "650-123-0002"));
 
         MutableDocument doc = createDocument("doc1");
-        doc.set(dict);
+        doc.setData(dict);
         assertEquals(dict, doc.toMap());
 
         Document savedDoc = save(doc);
@@ -276,7 +276,7 @@ public void testSetDictionaryContent() throws CouchbaseLiteException {
         nuDict.put("phones", Arrays.asList("650-234-0001", "650-234-0002"));
 
         doc = savedDoc.toMutable();
-        doc.set(nuDict);
+        doc.setData(nuDict);
         assertEquals(nuDict, doc.toMap());
 
         savedDoc = save(doc);
@@ -1632,7 +1632,7 @@ public void testRemoveKeys() throws CouchbaseLiteException {
         profile.put("active", true);
         profile.put("age", 30);
         profile.put("address", mapAddress);
-        doc.set(profile);
+        doc.setData(profile);
 
         save(doc);
 
@@ -1681,7 +1681,7 @@ public void testContainsKey() {
         profile.put("name", "Jason");
         profile.put("age", 30);
         profile.put("address", mapAddress);
-        doc.set(profile);
+        doc.setData(profile);
 
         assertTrue(doc.contains("type"));
         assertTrue(doc.contains("name"));

shared/src/main/java/com/couchbase/lite/MutableArray.java

@@ -27,11 +27,11 @@ public MutableArray() {
      * Map, Number, null, String, Array, Blob, and Dictionary. The List and Map must contain
      * only the above types.
      *
-     * @param array the array object.
+     * @param data the array object.
      */
-    public MutableArray(List<Object> array) {
+    public MutableArray(List<Object> data) {
         super();
-        set(array);
+        setData(data);
     }
 
     // to create copy
@@ -54,13 +54,13 @@ public MutableArray(List<Object> array) {
      * only the above types. Setting the new array content will replcace the current data
      * including the existing Array and Dictionary objects.
      *
-     * @param array the array
+     * @param data the array
      * @return this Array instance
      */
     @Override
-    public MutableArray set(List<Object> array) {
+    public MutableArray setData(List<Object> data) {
         _array.clear();
-        for (Object obj : array)
+        for (Object obj : data)
             _array.append(CBLFleece.toCBLObject(obj));
         return this;
     }

shared/src/main/java/com/couchbase/lite/MutableArrayInterface.java

@@ -4,7 +4,7 @@
 import java.util.List;
 
 interface MutableArrayInterface extends ArrayInterface {
-    MutableArrayInterface set(List<Object> list);
+    MutableArrayInterface setData(List<Object> data);
 
     // set
     MutableArrayInterface setValue(int index, Object value);

shared/src/main/java/com/couchbase/lite/MutableDictionary.java

@@ -27,11 +27,11 @@ public MutableDictionary() {
      * Date, Map, Number, null, String, Array, Blob, and Dictionary. The List and Map must contain
      * only the above types.
      *
-     * @param dictionary the dictionary object.
+     * @param data the dictionary object.
      */
-    public MutableDictionary(Map<String, Object> dictionary) {
+    public MutableDictionary(Map<String, Object> data) {
         super();
-        set(dictionary);
+        setData(data);
     }
 
     // to create copy of dictionary
@@ -53,13 +53,13 @@ public MutableDictionary(Map<String, Object> dictionary) {
      * Setting the new dictionary content will replace the current data including the existing Array
      * and Dictionary objects.
      *
-     * @param dictionary the dictionary object.
+     * @param data the dictionary object.
      * @return this Dictionary instance
      */
     @Override
-    public MutableDictionary set(Map<String, Object> dictionary) {
+    public MutableDictionary setData(Map<String, Object> data) {
         _dict.clear();
-        for (Map.Entry<String, Object> entry : dictionary.entrySet())
+        for (Map.Entry<String, Object> entry : data.entrySet())
             _dict.set(entry.getKey(), new MValue(CBLFleece.toCBLObject(entry.getValue())));
         return this;
     }

shared/src/main/java/com/couchbase/lite/MutableDictionaryInterface.java

@@ -5,7 +5,7 @@
 
 interface MutableDictionaryInterface extends DictionaryInterface {
     // Set JSON or platform dictionary as a content.
-    MutableDictionaryInterface set(Map<String, Object> dictionary);
+    MutableDictionaryInterface setData(Map<String, Object> data);
 
     // set
     MutableDictionaryInterface setValue(String key, Object value);

shared/src/main/java/com/couchbase/lite/MutableDocument.java

@@ -57,11 +57,11 @@ public MutableDocument(String id) {
      * saved into a database when you call the Database's save(Document) method with the document
      * object given.
      *
-     * @param dictionary the Map object
+     * @param data the Map object
      */
-    public MutableDocument(Map<String, Object> dictionary) {
+    public MutableDocument(Map<String, Object> data) {
         this((String) null);
-        set(dictionary);
+        setData(data);
     }
 
     /**
@@ -72,12 +72,12 @@ public MutableDocument(Map<String, Object> dictionary) {
      * The created document will be saved into a database when you call
      * the Database's save(Document) method with the document object given.
      *
-     * @param id         the document ID.
-     * @param dictionary the Map object
+     * @param id   the document ID.
+     * @param data the Map object
      */
-    public MutableDocument(String id, Map<String, Object> dictionary) {
+    public MutableDocument(String id, Map<String, Object> data) {
         this(id);
-        set(dictionary);
+        setData(data);
     }
 
     MutableDocument(Document doc, Dictionary dict) {
@@ -100,12 +100,12 @@ public MutableDocument(String id, Map<String, Object> dictionary) {
      * Setting the new dictionary content will replace the current data including the existing Array
      * and Dictionary objects.
      *
-     * @param dictionary the dictionary object.
+     * @param data the dictionary object.
      * @return this Document instance
      */
     @Override
-    public MutableDocument set(Map<String, Object> dictionary) {
-        ((MutableDictionary) _dict).set(dictionary);
+    public MutableDocument setData(Map<String, Object> data) {
+        ((MutableDictionary) _dict).setData(data);
         return this;
     }