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/19 20:40:48 UTC
[sling-org-apache-sling-clam] branch master updated (941582c -> 6ea0c08)
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 941582c SLING-11257 Improve long running MailSendingScanResultHandler integration test
new 1b3e555 suppress warnings for rule java:S112
new 6ea0c08 suppress warnings for rule java:S3457
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:
.../apache/sling/clam/http/internal/ClamEventsServlet.java | 1 +
.../java/org/apache/sling/clam/http/internal/RequestUtil.java | 11 ++++++-----
src/main/java/org/apache/sling/clam/internal/ClamUtil.java | 1 +
.../sling/clam/job/internal/JcrPropertyScanJobConsumer.java | 1 +
.../clam/result/internal/MailSendingScanResultHandler.java | 2 +-
.../result/internal/ResourcePersistingScanResultHandler.java | 1 +
6 files changed, 11 insertions(+), 6 deletions(-)
[sling-org-apache-sling-clam] 01/02: suppress warnings for rule java:S112
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 1b3e555b837ae55410c7fe56873b8e989332fae2
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu May 19 22:39:22 2022 +0200
suppress warnings for rule java:S112
---
.../java/org/apache/sling/clam/http/internal/RequestUtil.java | 11 ++++++-----
src/main/java/org/apache/sling/clam/internal/ClamUtil.java | 1 +
.../sling/clam/job/internal/JcrPropertyScanJobConsumer.java | 1 +
.../clam/result/internal/MailSendingScanResultHandler.java | 2 +-
.../result/internal/ResourcePersistingScanResultHandler.java | 1 +
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/sling/clam/http/internal/RequestUtil.java b/src/main/java/org/apache/sling/clam/http/internal/RequestUtil.java
index cb0a7f5..dcb3ddb 100644
--- a/src/main/java/org/apache/sling/clam/http/internal/RequestUtil.java
+++ b/src/main/java/org/apache/sling/clam/http/internal/RequestUtil.java
@@ -39,6 +39,7 @@ public final class RequestUtil {
private RequestUtil() {
}
+ @SuppressWarnings("java:S112")
static String path(@NotNull final SlingHttpServletRequest request) throws Exception {
final String value = request.getParameter("path");
if (value == null) {
@@ -48,7 +49,7 @@ public final class RequestUtil {
}
}
- @SuppressWarnings({"javasecurity:S2631", "checkstyle:IllegalCatch"})
+ @SuppressWarnings({"java:S112", "javasecurity:S2631", "checkstyle:IllegalCatch"})
static Pattern pattern(@NotNull final SlingHttpServletRequest request, @NotNull final Pattern defaultPattern) throws Exception {
final String value = request.getParameter("pattern"); // ensure pattern input is from trusted source, e.g. authenticated and authorized users (ClamJcrScanServlet)
if (value == null) {
@@ -62,7 +63,7 @@ public final class RequestUtil {
}
}
- @SuppressWarnings("checkstyle:IllegalCatch")
+ @SuppressWarnings({"java:S112", "checkstyle:IllegalCatch"})
static Set<Integer> propertyTypes(@NotNull final SlingHttpServletRequest request, @NotNull final Set<Integer> defaultPropertyTypes) throws Exception {
final String[] values = request.getParameterValues("propertyTypes");
if (values == null || values.length == 0) {
@@ -75,7 +76,7 @@ public final class RequestUtil {
}
}
- @SuppressWarnings("checkstyle:IllegalCatch")
+ @SuppressWarnings({"java:S112", "checkstyle:IllegalCatch"})
static long maxLength(@NotNull final SlingHttpServletRequest request, final long defaultMaxLength) throws Exception {
final String value = request.getParameter("maxLength");
if (value == null) {
@@ -89,7 +90,7 @@ public final class RequestUtil {
}
}
- @SuppressWarnings("checkstyle:IllegalCatch")
+ @SuppressWarnings({"java:S112", "checkstyle:IllegalCatch"})
static int maxDepth(@NotNull final SlingHttpServletRequest request, final int defaultMaxDepth) throws Exception {
final String value = request.getParameter("maxDepth");
if (value == null) {
@@ -103,7 +104,7 @@ public final class RequestUtil {
}
}
- @SuppressWarnings("checkstyle:ReturnCount")
+ @SuppressWarnings({"java:S112", "checkstyle:ReturnCount"})
static boolean isAuthorized(@NotNull final SlingHttpServletRequest request, @NotNull final Collection<String> authorizedGroups) throws Exception {
final Authorizable authorizable = request.getResourceResolver().adaptTo(Authorizable.class);
if (authorizable == null) {
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 84e23af..35b9ca3 100644
--- a/src/main/java/org/apache/sling/clam/internal/ClamUtil.java
+++ b/src/main/java/org/apache/sling/clam/internal/ClamUtil.java
@@ -92,6 +92,7 @@ public final class ClamUtil {
return length <= maxLength;
}
+ @SuppressWarnings("java:S112")
public static Set<Integer> propertyTypesFromNames(@NotNull final String[] names) throws Exception {
final Set<Integer> propertyTypes = new HashSet<>();
for (final String name : names) {
diff --git a/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java b/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java
index a0ec82c..ee10dde 100644
--- a/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java
+++ b/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java
@@ -146,6 +146,7 @@ public final class JcrPropertyScanJobConsumer implements JobConsumer {
}
}
+ @SuppressWarnings("java:S112")
private InputStream getInputStream(final Value value) throws Exception {
final int propertyType = value.getType();
if (propertyType == PropertyType.BINARY) {
diff --git a/src/main/java/org/apache/sling/clam/result/internal/MailSendingScanResultHandler.java b/src/main/java/org/apache/sling/clam/result/internal/MailSendingScanResultHandler.java
index d7df2b3..9d60204 100644
--- a/src/main/java/org/apache/sling/clam/result/internal/MailSendingScanResultHandler.java
+++ b/src/main/java/org/apache/sling/clam/result/internal/MailSendingScanResultHandler.java
@@ -67,7 +67,7 @@ import static org.apache.sling.clam.internal.ClamUtil.properties;
ocd = MailSendingScanResultHandlerConfiguration.class,
factory = true
)
-@SuppressWarnings({"java:S3077", "checkstyle:ClassFanOutComplexity"})
+@SuppressWarnings({"java:S112", "java:S3077", "checkstyle:ClassFanOutComplexity"})
public final class MailSendingScanResultHandler implements JcrPropertyScanResultHandler {
@Reference(
diff --git a/src/main/java/org/apache/sling/clam/result/internal/ResourcePersistingScanResultHandler.java b/src/main/java/org/apache/sling/clam/result/internal/ResourcePersistingScanResultHandler.java
index 4d1cfec..fa511b9 100644
--- a/src/main/java/org/apache/sling/clam/result/internal/ResourcePersistingScanResultHandler.java
+++ b/src/main/java/org/apache/sling/clam/result/internal/ResourcePersistingScanResultHandler.java
@@ -143,6 +143,7 @@ public final class ResourcePersistingScanResultHandler implements JcrPropertySca
return !scanResult.isOk() || configuration.result_status_ok_persist();
}
+ @SuppressWarnings("java:S112")
private void persistResult(@NotNull final ScanResult scanResult, @NotNull final String path, final Integer index, final int propertyType, @Nullable final String userId) {
try (ResourceResolver resourceResolver = serviceResourceResolver()) {
final Map<String, Object> properties = properties(path, index, userId, scanResult);
[sling-org-apache-sling-clam] 02/02: suppress warnings for rule java:S3457
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 6ea0c08d4676b8417d6079b000ed945460640ec2
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu May 19 22:40:22 2022 +0200
suppress warnings for rule java:S3457
---
src/main/java/org/apache/sling/clam/http/internal/ClamEventsServlet.java | 1 +
1 file changed, 1 insertion(+)
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 e29128e..4f80ce0 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
@@ -174,6 +174,7 @@ public final class ClamEventsServlet extends HttpServlet implements JcrPropertyS
final ServletOutputStream outputStream = context.getResponse().getOutputStream();
while (outputStream.isReady() && events.peek() != null) {
final Event event = events.poll();
+ @SuppressWarnings("java:S3457")
final String data = String.format("event: %s\ndata: %s\n\n", event.getType(), event.getData());
outputStream.write(data.getBytes(StandardCharsets.UTF_8));
flushIfReady(outputStream);