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 2016/07/21 10:30:32 UTC
svn commit: r1753661 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document:
DocumentMK.java DocumentNodeState.java
Author: mreutegg
Date: Thu Jul 21 10:30:32 2016
New Revision: 1753661
URL: http://svn.apache.org/viewvc?rev=1753661&view=rev
Log:
OAK-4584: Move DocumentMK specific methods from DocumentNodeStore
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1753661&r1=1753660&r2=1753661&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java Thu Jul 21 10:30:32 2016
@@ -53,6 +53,7 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.commons.json.JsopReader;
import org.apache.jackrabbit.oak.commons.json.JsopStream;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
+import org.apache.jackrabbit.oak.commons.json.JsopWriter;
import org.apache.jackrabbit.oak.json.JsopDiff;
import org.apache.jackrabbit.oak.plugins.blob.BlobStoreStats;
import org.apache.jackrabbit.oak.plugins.blob.CachingBlobStore;
@@ -242,7 +243,7 @@ public class DocumentMK {
boolean includeId = filter != null && filter.contains(":id");
includeId |= filter != null && filter.contains(":hash");
json.object();
- n.append(json, includeId);
+ append(n, json, includeId);
int max;
if (maxChildNodes == -1) {
max = Integer.MAX_VALUE;
@@ -517,6 +518,17 @@ public class DocumentMK {
}
}
+ private static void append(DocumentNodeState node,
+ JsopWriter json,
+ boolean includeId) {
+ if (includeId) {
+ json.key(":id").value(node.getId());
+ }
+ for (String name : node.getPropertyNames()) {
+ json.key(name).encodedValue(node.getPropertyAsString(name));
+ }
+ }
+
//----------------------------< Builder >-----------------------------------
/**
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java?rev=1753661&r1=1753660&r2=1753661&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java Thu Jul 21 10:30:32 2016
@@ -45,8 +45,6 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
-import org.apache.jackrabbit.oak.util.PerfLogger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
@@ -392,15 +390,6 @@ public class DocumentNodeState extends A
return path + "@" + lastRevision;
}
- void append(JsopWriter json, boolean includeId) {
- if (includeId) {
- json.key(":id").value(getId());
- }
- for (String p : properties.keySet()) {
- json.key(p).encodedValue(getPropertyAsString(p));
- }
- }
-
void setLastRevision(RevisionVector lastRevision) {
this.lastRevision = lastRevision;
}