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 md...@apache.org on 2014/02/24 10:19:24 UTC
svn commit: r1571194 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak:
core/MutableTree.java plugins/tree/AbstractTree.java
plugins/tree/ImmutableTree.java
Author: mduerig
Date: Mon Feb 24 09:19:24 2014
New Revision: 1571194
URL: http://svn.apache.org/r1571194
Log:
OAK-1440: o.a.j.o.api.Tree.toString hits hidden nodes
Improve toString() implementation
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/AbstractTree.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ImmutableTree.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java?rev=1571194&r1=1571193&r2=1571194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java Mon Feb 24 09:19:24 2014
@@ -18,8 +18,19 @@
*/
package org.apache.jackrabbit.oak.core;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.Iterables.filter;
+import static com.google.common.collect.Iterables.indexOf;
+import static org.apache.jackrabbit.oak.api.Type.NAME;
+import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
+import static org.apache.jackrabbit.oak.commons.PathUtils.isAbsolute;
+import static org.apache.jackrabbit.oak.spi.state.NodeStateUtils.isHidden;
+
import java.util.Collections;
import java.util.Set;
+
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
@@ -36,16 +47,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.tree.TreeConstants;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.indexOf;
-import static org.apache.jackrabbit.oak.api.Type.NAME;
-import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
-import static org.apache.jackrabbit.oak.commons.PathUtils.isAbsolute;
-import static org.apache.jackrabbit.oak.spi.state.NodeStateUtils.isHidden;
-
class MutableTree extends AbstractTree {
/**
@@ -370,7 +371,8 @@ class MutableTree extends AbstractTree {
}
}
- private void buildPath(StringBuilder sb) {
+ @Override
+ protected void buildPath(StringBuilder sb) {
if (parent != null) {
parent.buildPath(sb);
sb.append('/').append(name);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/AbstractTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/AbstractTree.java?rev=1571194&r1=1571193&r2=1571194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/AbstractTree.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/AbstractTree.java Mon Feb 24 09:19:24 2014
@@ -24,9 +24,9 @@ import static com.google.common.base.Pre
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.size;
import static com.google.common.collect.Iterables.transform;
-import static org.apache.jackrabbit.oak.api.Tree.Status.UNCHANGED;
import static org.apache.jackrabbit.oak.api.Tree.Status.MODIFIED;
import static org.apache.jackrabbit.oak.api.Tree.Status.NEW;
+import static org.apache.jackrabbit.oak.api.Tree.Status.UNCHANGED;
import static org.apache.jackrabbit.oak.api.Type.NAME;
import static org.apache.jackrabbit.oak.spi.state.NodeStateUtils.isHidden;
@@ -40,7 +40,6 @@ import org.apache.jackrabbit.oak.api.Pro
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.reference.NodeReferenceConstants;
-import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.ConflictAnnotatingRebaseDiff;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -163,26 +162,21 @@ public abstract class AbstractTree imple
@Override
public String toString() {
- return getPath() + ": " + toString(getNodeState());
- }
-
- protected String toString(NodeState nodeState) {
StringBuilder sb = new StringBuilder();
+ sb.append(getPath()).append(": ");
+
sb.append('{');
- for (PropertyState p : nodeState.getProperties()) {
- if (!isHidden(p.getName())) {
- sb.append(' ').append(p).append(',');
- }
+ for (PropertyState p : getProperties()) {
+ sb.append(' ').append(p).append(',');
}
- for (ChildNodeEntry n : nodeState.getChildNodeEntries()) {
- if(!isHidden(n.getName())) {
- sb.append(' ').append(n.getName()).append( " = { ... },");
- }
+ for (String n : this.getChildNames()) {
+ sb.append(' ').append(n).append( " = { ... },");
}
- if (sb.length() > 1) {
+ if (sb.charAt(sb.length() - 1) == ',') {
sb.deleteCharAt(sb.length() - 1);
}
sb.append('}');
+
return sb.toString();
}
@@ -209,7 +203,7 @@ public abstract class AbstractTree imple
}
}
- private void buildPath(StringBuilder sb) {
+ protected void buildPath(StringBuilder sb) {
if (!isRoot()) {
getParent().buildPath(sb);
sb.append('/').append(name);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ImmutableTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ImmutableTree.java?rev=1571194&r1=1571193&r2=1571194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ImmutableTree.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ImmutableTree.java Mon Feb 24 09:19:24 2014
@@ -205,11 +205,6 @@ public final class ImmutableTree extends
return false;
}
- @Override
- public String toString() {
- return "ImmutableTree '" + getName() + "':" + toString(state);
- }
-
//--------------------------------------------------------------------------
public interface ParentProvider {