This is an automated email from the ASF dual-hosted git repository.
nfsantos pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new f0d805f29a OAK-10804 - Optimize check for hidden paths and clear
warnings in NodeStateUtils class. (#1461)
f0d805f29a is described below
commit f0d805f29a7146735dffd00e3007d24067378879
Author: Nuno Santos <[email protected]>
AuthorDate: Thu May 16 15:17:44 2024 +0200
OAK-10804 - Optimize check for hidden paths and clear warnings in
NodeStateUtils class. (#1461)
---
.../apache/jackrabbit/oak/spi/state/NodeStateUtils.java | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git
a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStateUtils.java
b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStateUtils.java
index 98ff6e2a67..7e7da54d49 100644
---
a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStateUtils.java
+++
b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStateUtils.java
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.spi.state;
import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.guava.common.base.Strings.repeat;
-import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
@@ -53,12 +52,7 @@ public final class NodeStateUtils {
* @return true if one of the nodes is hidden
*/
public static boolean isHiddenPath(@NotNull String path) {
- for (String n : PathUtils.elements(path)) {
- if (isHidden(n)) {
- return true;
- }
- }
- return false;
+ return (!path.isEmpty() && path.charAt(0) == ':') ||
path.contains("/:");
}
@Nullable
@@ -92,9 +86,7 @@ public final class NodeStateUtils {
if (node == null) {
return "[null]";
}
- StringBuilder sb = new StringBuilder();
- sb.append(toString(node, 1, " ", "/"));
- return sb.toString();
+ return toString(node, 1, " ", "/");
}
private static String toString(NodeState ns, int level, String prepend,
@@ -119,7 +111,7 @@ public final class NodeStateUtils {
node.append("}");
}
for (ChildNodeEntry c : ns.getChildNodeEntries()) {
- node.append(IOUtils.LINE_SEPARATOR);
+ node.append(System.lineSeparator());
node.append(toString(c.getNodeState(), level + 1, prepend,
c.getName()));
}