You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2022/05/21 09:37:37 UTC
[sling-org-apache-sling-clam] branch master updated (206a68a -> f6d1982)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-clam.git
from 206a68a style
new 0b7adb4 fix warning for rule java:S3398
new f6d1982 suppress warnings for rule java:S1989
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../clam/http/internal/ClamEventsServlet.java | 2 +-
.../internal/NodeObservingJcrPropertyDigger.java | 36 +++++++++++-----------
2 files changed, 19 insertions(+), 19 deletions(-)
[sling-org-apache-sling-clam] 02/02: suppress warnings for rule java:S1989
Posted by ol...@apache.org.
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 f6d198255073cab3d4e843ba59e0d135040d4c3f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat May 21 11:37:18 2022 +0200
suppress warnings for rule java:S1989
---
.../java/org/apache/sling/clam/http/internal/ClamEventsServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServlet.java b/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServlet.java
index 4f80ce0..dcc5d21 100644
--- a/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServlet.java
+++ b/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServlet.java
@@ -71,7 +71,7 @@ import static org.apache.sling.clam.http.internal.ResponseUtil.json;
@Designate(
ocd = ClamEventsServletConfiguration.class
)
-@SuppressWarnings("java:S1948")
+@SuppressWarnings({"java:S1948", "java:S1989"})
public final class ClamEventsServlet extends HttpServlet implements JcrPropertyScanResultHandler {
private static final String JCR_RESULT_EVENT_TYPE = "sling/clam/jcr/result";
[sling-org-apache-sling-clam] 01/02: fix warning for rule java:S3398
Posted by ol...@apache.org.
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 0b7adb44077edfb3f5def2363fe3091acb19bc83
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat May 21 11:26:10 2022 +0200
fix warning for rule java:S3398
---
.../internal/NodeObservingJcrPropertyDigger.java | 36 +++++++++++-----------
1 file changed, 18 insertions(+), 18 deletions(-)
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 4dd6ef1..e63bda9 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
@@ -157,24 +157,6 @@ public final class NodeObservingJcrPropertyDigger extends NodeObserver {
threadPool.submit(digTask);
}
- private Set<String> filter(final String path, final Set<String> names, final Pattern pattern) {
- final Set<String> paths = new HashSet<>();
- for (final String name : names) {
- final String p = String.format("%s/%s", path, name);
- if (pattern.matcher(p).matches()) {
- if (logger.isDebugEnabled()) {
- logger.debug("path '{}' matches pattern '{}'", p, pattern.pattern());
- }
- paths.add(p);
- } else {
- if (logger.isDebugEnabled()) {
- logger.debug("path '{}' doesn't match pattern '{}'", p, pattern.pattern());
- }
- }
- }
- return paths;
- }
-
private Set<String> concat(final Set<String> a, final Set<String> b) {
final Set<String> set = new HashSet<>(a);
set.addAll(b);
@@ -204,6 +186,24 @@ public final class NodeObservingJcrPropertyDigger extends NodeObserver {
this.userId = userId;
}
+ private Set<String> filter(final String path, final Set<String> names, final Pattern pattern) {
+ final Set<String> paths = new HashSet<>();
+ for (final String name : names) {
+ final String p = String.format("%s/%s", path, name);
+ if (pattern.matcher(p).matches()) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("path '{}' matches pattern '{}'", p, pattern.pattern());
+ }
+ paths.add(p);
+ } else {
+ if (logger.isDebugEnabled()) {
+ logger.debug("path '{}' doesn't match pattern '{}'", p, pattern.pattern());
+ }
+ }
+ }
+ return paths;
+ }
+
@Override
@SuppressWarnings({"java:S3776", "checkstyle:IllegalCatch", "checkstyle:NestedIfDepth"})
public void run() {