You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2019/03/26 14:50:51 UTC
svn commit: r1856320 - in /jackrabbit/oak/trunk/oak-store-document/src:
main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
Author: mreutegg
Date: Tue Mar 26 14:50:51 2019
New Revision: 1856320
URL: http://svn.apache.org/viewvc?rev=1856320&view=rev
Log:
OAK-8171: Remove DocumentNodeState.getId()
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java?rev=1856320&r1=1856319&r2=1856320&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java Tue Mar 26 14:50:51 2019
@@ -428,10 +428,6 @@ public class DocumentNodeState extends A
return op;
}
- String getId() {
- return path + "@" + lastRevision;
- }
-
@Override
public int getMemory() {
long size = 40 // shallow
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1856320&r1=1856319&r2=1856320&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java Tue Mar 26 14:50:51 2019
@@ -450,7 +450,7 @@ public class DocumentMK {
JsopWriter json,
boolean includeId) {
if (includeId) {
- json.key(":id").value(node.getId());
+ json.key(":id").value(node.getPath() + "@" + node.getLastRevision());
}
for (String name : node.getPropertyNames()) {
json.key(name).encodedValue(node.getPropertyAsString(name));