Author: reschke
Date: Thu Oct 22 15:13:47 2015
New Revision: 1710031
URL: http://svn.apache.org/viewvc?rev=1710031&view=rev
Log:
JCR-3539: add entrySet() to Document and use it in MemoryDocumentStore and
RDBDocumentStore
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java?rev=1710031&r1=1710030&r2=1710031&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
Thu Oct 22 15:13:47 2015
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Collections;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.NavigableMap;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -117,6 +118,13 @@ public class Document implements CacheVa
}
/**
+ * @return a Set view of the entries contained in this document.
+ */
+ public Set<Entry<String, Object>> entrySet() {
+ return data.entrySet();
+ }
+
+ /**
* Seals this document and turns it into an immutable object. Any attempt
* to modify this document afterwards will result in an
* {@link UnsupportedOperationException}.
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java?rev=1710031&r1=1710030&r2=1710031&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
Thu Oct 22 15:13:47 2015
@@ -350,8 +350,8 @@ public class MemoryDocumentStore impleme
for (String p : nodes.keySet()) {
buff.append("Path: ").append(p).append('\n');
NodeDocument doc = nodes.get(p);
- for (String prop : doc.keySet()) {
-
buff.append(prop).append('=').append(doc.get(prop)).append('\n');
+ for (Map.Entry<String, Object> entry : doc.entrySet()) {
+
buff.append(entry.getKey()).append('=').append(entry.getValue()).append('\n');
}
buff.append("\n");
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java?rev=1710031&r1=1710030&r2=1710031&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
Thu Oct 22 15:13:47 2015
@@ -74,12 +74,13 @@ public class RDBDocumentSerializer {
StringBuilder sb = new StringBuilder(32768);
sb.append("{");
boolean needComma = false;
- for (String key : doc.keySet()) {
+ for (Map.Entry<String, Object> entry : doc.entrySet()) {
+ String key = entry.getKey();
if (!columnProperties.contains(key)) {
if (needComma) {
sb.append(",");
}
- appendMember(sb, key, doc.get(key));
+ appendMember(sb, key, entry.getValue());
needComma = true;
}
}
