This is an automated email from the ASF dual-hosted git repository. olli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-clam.git
commit 62c1857bf635e8d49124456a5e9eadae571005d2 Author: Oliver Lietz <[email protected]> AuthorDate: Sat Jan 26 16:02:27 2019 +0100 move length check to ClamUtil --- src/main/java/org/apache/sling/clam/internal/ClamUtil.java | 7 +++++++ .../sling/clam/oak/internal/NodeObservingJcrPropertyDigger.java | 9 +-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/sling/clam/internal/ClamUtil.java b/src/main/java/org/apache/sling/clam/internal/ClamUtil.java index bd0ce54..1a40c35 100644 --- a/src/main/java/org/apache/sling/clam/internal/ClamUtil.java +++ b/src/main/java/org/apache/sling/clam/internal/ClamUtil.java @@ -75,4 +75,11 @@ public final class ClamUtil { return properties; } + public static boolean checkLength(final long length, final long maxLength) { + if (maxLength == -1) { + return true; + } + return length <= maxLength; + } + } diff --git a/src/main/java/org/apache/sling/clam/oak/internal/NodeObservingJcrPropertyDigger.java b/src/main/java/org/apache/sling/clam/oak/internal/NodeObservingJcrPropertyDigger.java index b7585d7..85c8364 100644 --- a/src/main/java/org/apache/sling/clam/oak/internal/NodeObservingJcrPropertyDigger.java +++ b/src/main/java/org/apache/sling/clam/oak/internal/NodeObservingJcrPropertyDigger.java @@ -34,7 +34,6 @@ import org.apache.jackrabbit.oak.spi.commit.Observable; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; -import org.apache.sling.clam.internal.ClamUtil; import org.apache.sling.commons.threads.ThreadPool; import org.apache.sling.commons.threads.ThreadPoolManager; import org.apache.sling.event.jobs.JobManager; @@ -52,6 +51,7 @@ import org.osgi.service.metatype.annotations.Designate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.apache.sling.clam.internal.ClamUtil.checkLength; import static org.apache.sling.clam.internal.ClamUtil.properties; import static org.apache.sling.clam.internal.ClamUtil.scanJobTopic; @@ -177,13 +177,6 @@ public class NodeObservingJcrPropertyDigger extends NodeObserver { return paths; } - private boolean checkLength(final long length, final long maxLength) { - if (maxLength == -1) { - return true; - } - return length <= maxLength; - } - private Set<String> concat(final Set<String> a, Set<String> b) { final Set<String> set = new HashSet<>(a); set.addAll(b);
