Get rid of the dead code in DeltaValueStoreJsonImpl because DeltaValueStore no longer tracks deletes. Patch by: amitmanjhi Review by: rjrjr git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@8641 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/requestfactory/client/impl/DeltaValueStoreJsonImpl.java b/user/src/com/google/gwt/requestfactory/client/impl/DeltaValueStoreJsonImpl.java index c3a81f8..c961970 100644 --- a/user/src/com/google/gwt/requestfactory/client/impl/DeltaValueStoreJsonImpl.java +++ b/user/src/com/google/gwt/requestfactory/client/impl/DeltaValueStoreJsonImpl.java
@@ -363,6 +363,7 @@ } private String getJsonForOperation(WriteOperation writeOperation) { + assert (writeOperation == WriteOperation.CREATE || writeOperation == WriteOperation.UPDATE); Map<RecordKey, RecordJsoImpl> recordsMap = getRecordsMap(writeOperation); if (recordsMap.size() == 0) { return ""; @@ -379,11 +380,7 @@ } requestData.append("{\"" + entry.getValue().getSchema().getToken() + "\":"); - if (writeOperation != WriteOperation.DELETE) { - requestData.append(impl.toJson()); - } else { - requestData.append(impl.toJsonIdVersion()); - } + requestData.append(impl.toJson()); requestData.append("}"); } requestData.append("]");
diff --git a/user/src/com/google/gwt/requestfactory/client/impl/RecordJsoImpl.java b/user/src/com/google/gwt/requestfactory/client/impl/RecordJsoImpl.java index a41f5c0..2060450 100644 --- a/user/src/com/google/gwt/requestfactory/client/impl/RecordJsoImpl.java +++ b/user/src/com/google/gwt/requestfactory/client/impl/RecordJsoImpl.java
@@ -370,25 +370,6 @@ return rtn; }-*/; - /** - * Return JSON representation of just id and version fields, using org.json - * library. - * - * @return returned string. - */ - public final native String toJsonIdVersion() /*-{ - // Safari 4.0.5 appears not to honor the replacer argument, so we can't do this: - // var replacer = function(key, value) { - // if (key == 'id' || key == 'version') { - // return value; - // } - // return; - // } - // return $wnd.JSON.stringify(this, replacer); - var object = { id: this.id, version: this.version }; - return $wnd.JSON.stringify(object); - }-*/; - private native boolean copyPropertyIfDifferent(String name, RecordJsoImpl from) /*-{ if (this[name] == from[name]) {
diff --git a/user/test/com/google/gwt/requestfactory/client/impl/RecordJsoImplTest.java b/user/test/com/google/gwt/requestfactory/client/impl/RecordJsoImplTest.java index 4a48394..ab71759 100644 --- a/user/test/com/google/gwt/requestfactory/client/impl/RecordJsoImplTest.java +++ b/user/test/com/google/gwt/requestfactory/client/impl/RecordJsoImplTest.java
@@ -81,11 +81,6 @@ assertEquals(ID_VERSION_JSON, getMinimalJso().toJson()); } - public void testToJsonIdVersion() { - assertEquals(ID_VERSION_JSON, getPopulatedJso().toJsonIdVersion()); - assertEquals(ID_VERSION_JSON, getMinimalJso().toJsonIdVersion()); - } - private RecordJsoImpl getEmptyJso() { return RecordJsoImpl.create(); }