Johannes/gson-comments
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removing JsonObject.deepCopy() and JsonArray.deepCopy()

Browse Source
This commit is contained in:
Jesse Wilson 2011-11-12 23:32:44 +00:00
parent 0ac36805c2
commit 172143df7c
7 changed files with 0 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gson/src/main/java/com/google/gson/JsonArray.java
View File

@ -61,18 +61,6 @@ public final class JsonArray extends JsonElement implements Iterable<JsonElement
elements.addAll(array.elements);
}
/**
* Returns a deep copy of this array.
*/
@Override public JsonArray deepCopy() {
JsonArray result = new JsonArray();
result.elements.addAll(elements);
for (int i = 0; i < result.elements.size(); i++) {
result.elements.set(i, result.elements.get(i).deepCopy());
}
return result;
}
/**
* Returns the number of elements in the array.
*

5
gson/src/main/java/com/google/gson/JsonElement.java
View File

@ -306,11 +306,6 @@ public abstract class JsonElement {
throw new UnsupportedOperationException(getClass().getSimpleName());
}
/**
* Returns a deep copy of this. Immutable values can return this.
*/
abstract JsonElement deepCopy();
/**
* Returns a String representation of this element.
*/

4
gson/src/main/java/com/google/gson/JsonNull.java
View File

@ -40,10 +40,6 @@ public final class JsonNull extends JsonElement {
// Do nothing
}
@Override JsonElement deepCopy() {
return this; // immutable!
}
/**
* All instances of JsonNull have the same hash code since they are indistinguishable
*/

12
gson/src/main/java/com/google/gson/JsonObject.java
View File

@ -122,18 +122,6 @@ public final class JsonObject extends JsonElement {
return value == null ? JsonNull.INSTANCE : new JsonPrimitive(value);
}
/**
* Returns a deep copy of this object.
*/
@Override public JsonObject deepCopy() {
JsonObject result = new JsonObject();
result.members.putAll(members);
for (Map.Entry<String, JsonElement> entry : result.members.entrySet()) {
entry.setValue(entry.getValue().deepCopy());
}
return result;
}
/**
* Returns a set of members of this object. The set is ordered, and the order is in which the
* elements were added.

4
gson/src/main/java/com/google/gson/JsonPrimitive.java
View File

@ -98,10 +98,6 @@ public final class JsonPrimitive extends JsonElement {
}
}
@Override JsonElement deepCopy() {
return this; // immutable!
}
/**
* Check whether this primitive contains a boolean value.
*

33
gson/src/test/java/com/google/gson/JsonArrayTest.java
View File

@ -49,37 +49,4 @@ public final class JsonArrayTest extends TestCase {
assertFalse(a.equals(b));
assertFalse(b.equals(a));
}
public void testDeepCopy() {
JsonObject v1 = new JsonObject();
v1.add("k", new JsonPrimitive("v"));
JsonNull v2 = JsonNull.INSTANCE;
JsonPrimitive v3 = new JsonPrimitive("abc");
JsonArray v4 = new JsonArray();
v4.add(new JsonPrimitive("def"));
JsonArray array = new JsonArray();
array.add(v1);
array.add(v2);
array.add(v3);
array.add(v4);
// the deep copy must be equal
JsonArray deepCopy = array.deepCopy();
assertEquals(array, deepCopy);
// collections must be copied by value
JsonObject d1 = deepCopy.get(0).getAsJsonObject();
assertEquals(v1, d1);
assertTrue(v1 != d1);
JsonArray d4 = deepCopy.get(3).getAsJsonArray();
assertEquals(v4, d4);
assertTrue(v4 != d4);
// collections should themselves be deeply immutable
v1.add("k2", new JsonPrimitive("v2"));
assertEquals(1, d1.entrySet().size());
v4.add(new JsonPrimitive("ghi"));
assertEquals(1, d4.size());
}
}

33
gson/src/test/java/com/google/gson/JsonObjectTest.java
View File

@ -156,37 +156,4 @@ public class JsonObjectTest extends TestCase {
assertFalse(a.equals(b));
assertFalse(b.equals(a));
}
public void testDeepCopy() {
JsonObject v1 = new JsonObject();
v1.add("k", new JsonPrimitive("v"));
JsonNull v2 = JsonNull.INSTANCE;
JsonPrimitive v3 = new JsonPrimitive("abc");
JsonArray v4 = new JsonArray();
v4.add(new JsonPrimitive("def"));
JsonObject object = new JsonObject();
object.add("1", v1);
object.add("2", v2);
object.add("3", v3);
object.add("4", v4);
// the deep copy must be equal
JsonObject deepCopy = object.deepCopy();
assertEquals(object, deepCopy);
// collections must be copied by value
JsonObject d1 = deepCopy.get("1").getAsJsonObject();
assertEquals(v1, d1);
assertTrue(v1 != d1);
JsonArray d4 = deepCopy.get("4").getAsJsonArray();
assertEquals(v4, d4);
assertTrue(v4 != d4);
// collections should themselves be deeply immutable
v1.add("k2", new JsonPrimitive("v2"));
assertEquals(1, d1.entrySet().size());
v4.add(new JsonPrimitive("ghi"));
assertEquals(1, d4.size());
}
}