You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2019/09/06 18:34:52 UTC
[sling-org-apache-sling-app-cms] branch master updated (45985fe ->
e43783f)
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.
from 45985fe Fixing some issues found by SonarQube
new 164e5e9 Adding health checks and removing the public servlet as it's not secured
new e43783f Fixing a number of minor sonar qube issues
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:
builder/src/main/provisioning/cms.txt | 50 +++++++++++++++++++++-
builder/src/main/provisioning/healthcheck.txt | 5 ---
.../providers/HTMLValdiatorInsightProvider.java | 2 +-
.../core/internal/filters/EditIncludeFilter.java | 2 +-
.../internal/models/PageTemplateManagerImpl.java | 2 +-
.../apache/sling/cms/core/models/LocaleList.java | 7 +--
.../sling/cms/reference/models/ItemList.java | 2 +-
.../apache/sling/cms/reference/models/Search.java | 2 +-
.../cms/transformer/FileThumbnailTransformer.java | 1 -
.../internal/TransformerWebConsole.java | 4 +-
10 files changed, 57 insertions(+), 20 deletions(-)
[sling-org-apache-sling-app-cms] 01/02: Adding health checks and
removing the public servlet as it's not secured
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 164e5e9d29cd3cef106cf43ba320a7ef769f2e63
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Sep 6 14:27:02 2019 -0400
Adding health checks and removing the public servlet as it's not secured
---
builder/src/main/provisioning/cms.txt | 50 ++++++++++++++++++++++++++-
builder/src/main/provisioning/healthcheck.txt | 5 ---
2 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/builder/src/main/provisioning/cms.txt b/builder/src/main/provisioning/cms.txt
index 8511e37..a697f62 100644
--- a/builder/src/main/provisioning/cms.txt
+++ b/builder/src/main/provisioning/cms.txt
@@ -155,4 +155,52 @@
org.apache.sling.hc.support.DefaultLoginsHealthCheck-slingcms
logins=["admin:admin"]
hc.name="Sling CMS - Default Logins Check"
- hc.tags=["configuration"]
\ No newline at end of file
+ hc.tags=["configuration"]
+
+ org.apache.felix.hc.generalchecks.JmxAttributeCheck-jobqueue
+ mbean.name="org.apache.sling:type\=queues,name\=AllQueues"
+ hc.name="Sling - Job Queue"
+ hc.tags=["sling","system-resources"]
+ attribute.value.constraint="< 1000"
+ attribute.name="NumberOfQueuedJobs"
+ statusForFailedContraint="WARN"
+
+ org.apache.felix.hc.generalchecks.JmxAttributeCheck-requestdurationwarn
+ mbean.name="org.apache.sling:type\=engine,service\=RequestProcessor"
+ hc.name="Sling - StdDev Request Duration (WARN)"
+ hc.tags=["sling","system-resources"]
+ attribute.value.constraint="matches (1)?\\d?\\d\\..*"
+ attribute.name="StandardDeviationDurationMsec"
+ statusForFailedContraint="WARN"
+
+ org.apache.felix.hc.generalchecks.JmxAttributeCheck-requestdurationcritical
+ mbean.name="org.apache.sling:type\=engine,service\=RequestProcessor"
+ hc.name="Sling - StdDev Request Duration (CRITICAL)"
+ hc.tags=["sling","system-resources"]
+ attribute.value.constraint="matches (1|2|3|4)?\\d?\\d\\..*"
+ attribute.name="StandardDeviationDurationMsec"
+ statusForFailedContraint="CRITICAL"
+
+ org.apache.felix.hc.generalchecks.JmxAttributeCheck-index
+ mbean.name="org.apache.jackrabbit.oak:name\=async,type\=IndexStats"
+ hc.name="Jackrabbit Oak - Index"
+ hc.tags=["oak","system-resources"]
+ attribute.value.constraint="false"
+ attribute.name="Failing"
+ statusForFailedContraint="CRITICAL"
+
+ org.apache.felix.hc.generalchecks.JmxAttributeCheck-luceneindex
+ mbean.name="org.apache.jackrabbit.oak:name\=Lucene Index statistics,type\=LuceneIndex"
+ hc.name="Jackrabbit Oak - Lucene Index"
+ hc.tags=["oak","system-resources"]
+ attribute.value.constraint="false"
+ attribute.name="Failing"
+ statusForFailedContraint="CRITICAL"
+
+ org.apache.felix.hc.generalchecks.JmxAttributeCheck-slowqueries
+ mbean.name="org.apache.jackrabbit.oak:name\=Oak Query Statistics,type\=QueryStat"
+ hc.name="Jackrabbit Oak - Slow Queries"
+ hc.tags=["oak","system-resources"]
+ attribute.value.constraint="0"
+ attribute.name="SlowQueriesQueueSize"
+ statusForFailedContraint="WARN"
\ No newline at end of file
diff --git a/builder/src/main/provisioning/healthcheck.txt b/builder/src/main/provisioning/healthcheck.txt
index 9fc56db..9b2a83a 100644
--- a/builder/src/main/provisioning/healthcheck.txt
+++ b/builder/src/main/provisioning/healthcheck.txt
@@ -31,11 +31,6 @@
org.apache.sling/org.apache.sling.hc.support/1.0.6
[configurations]
-
- ## servlet
-
- org.apache.felix.hc.core.impl.servlet.HealthCheckExecutorServlet-default
- servletPath="/system/health"
## systemalive checks
[sling-org-apache-sling-app-cms] 02/02: Fixing a number of minor
sonar qube issues
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit e43783f43263e652ad65700de10a8d48be61a26d
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Sep 6 14:34:44 2019 -0400
Fixing a number of minor sonar qube issues
---
.../core/insights/impl/providers/HTMLValdiatorInsightProvider.java | 2 +-
.../apache/sling/cms/core/internal/filters/EditIncludeFilter.java | 2 +-
.../sling/cms/core/internal/models/PageTemplateManagerImpl.java | 2 +-
.../src/main/java/org/apache/sling/cms/core/models/LocaleList.java | 7 ++-----
.../main/java/org/apache/sling/cms/reference/models/ItemList.java | 2 +-
.../main/java/org/apache/sling/cms/reference/models/Search.java | 2 +-
.../org/apache/sling/cms/transformer/FileThumbnailTransformer.java | 1 -
.../sling/cms/transformer/internal/TransformerWebConsole.java | 4 +---
8 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/HTMLValdiatorInsightProvider.java b/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/HTMLValdiatorInsightProvider.java
index cbc541e..9b7f024 100644
--- a/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/HTMLValdiatorInsightProvider.java
+++ b/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/HTMLValdiatorInsightProvider.java
@@ -139,7 +139,7 @@ public class HTMLValdiatorInsightProvider extends BaseInsightProvider {
private void updateInsight(Insight insight, PageInsightRequest pageRequest, I18NDictionary dictionary, int errors,
int warnings) throws UnsupportedEncodingException {
- double score = 0.0;
+ double score;
if (errors > 5) {
insight.setPrimaryMessage(Message
.danger(dictionary.get(I18N_KEY_HTMLVALIDATOR_DANGER, new Object[] { errors, warnings })));
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/filters/EditIncludeFilter.java b/core/src/main/java/org/apache/sling/cms/core/internal/filters/EditIncludeFilter.java
index 322811d..7b894ee 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/filters/EditIncludeFilter.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/filters/EditIncludeFilter.java
@@ -71,7 +71,7 @@ public class EditIncludeFilter implements Filter {
}
private Iterator<Resource> getSiblings(Resource resource) {
- return Optional.ofNullable(resource.getParent()).map(p -> p.listChildren()).orElse(Collections.emptyIterator());
+ return Optional.ofNullable(resource.getParent()).map(Resource::listChildren).orElse(Collections.emptyIterator());
}
@Override
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/models/PageTemplateManagerImpl.java b/core/src/main/java/org/apache/sling/cms/core/internal/models/PageTemplateManagerImpl.java
index 0094fe0..cfe8091 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/models/PageTemplateManagerImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/models/PageTemplateManagerImpl.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
@Model(adaptables = Resource.class, adapters = PageTemplateManager.class)
public class PageTemplateManagerImpl implements PageTemplateManager {
- private static final Logger log = LoggerFactory.getLogger(PageTemplateManager.class);
+ private static final Logger log = LoggerFactory.getLogger(PageTemplateManagerImpl.class);
private Resource resource;
diff --git a/core/src/main/java/org/apache/sling/cms/core/models/LocaleList.java b/core/src/main/java/org/apache/sling/cms/core/models/LocaleList.java
index b177c3b..dfac4ad 100644
--- a/core/src/main/java/org/apache/sling/cms/core/models/LocaleList.java
+++ b/core/src/main/java/org/apache/sling/cms/core/models/LocaleList.java
@@ -17,7 +17,7 @@
package org.apache.sling.cms.core.models;
import java.text.DateFormat;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
@@ -34,10 +34,7 @@ import org.osgi.annotation.versioning.ProviderType;
public class LocaleList {
public List<Locale> getLocales() {
- List<Locale> locales = new ArrayList<>();
- for (Locale locale : DateFormat.getAvailableLocales()) {
- locales.add(locale);
- }
+ List<Locale> locales = Arrays.asList(DateFormat.getAvailableLocales());
Collections.sort(locales, (o1,o2) -> o1.toString().compareTo(o2.toString()));
return locales;
}
diff --git a/reference/src/main/java/org/apache/sling/cms/reference/models/ItemList.java b/reference/src/main/java/org/apache/sling/cms/reference/models/ItemList.java
index 68ee278..d8d8330 100644
--- a/reference/src/main/java/org/apache/sling/cms/reference/models/ItemList.java
+++ b/reference/src/main/java/org/apache/sling/cms/reference/models/ItemList.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
@Model(adaptables = SlingHttpServletRequest.class)
public class ItemList {
- private static final Logger log = LoggerFactory.getLogger(List.class);
+ private static final Logger log = LoggerFactory.getLogger(ItemList.class);
private int count;
diff --git a/reference/src/main/java/org/apache/sling/cms/reference/models/Search.java b/reference/src/main/java/org/apache/sling/cms/reference/models/Search.java
index dc38a62..0c94efd 100644
--- a/reference/src/main/java/org/apache/sling/cms/reference/models/Search.java
+++ b/reference/src/main/java/org/apache/sling/cms/reference/models/Search.java
@@ -111,7 +111,7 @@ public class Search {
Set<String> distinct = new HashSet<>();
- String term = Text.escapeIllegalXpathSearchChars(request.getParameter(TERM_PARAMETER)).replaceAll("'", "''");
+ String term = Text.escapeIllegalXpathSearchChars(request.getParameter(TERM_PARAMETER)).replace("'", "''");
resolver = searchService.getResourceResolver(request);
diff --git a/transformer/src/main/java/org/apache/sling/cms/transformer/FileThumbnailTransformer.java b/transformer/src/main/java/org/apache/sling/cms/transformer/FileThumbnailTransformer.java
index af26a7f..b54bc2a 100644
--- a/transformer/src/main/java/org/apache/sling/cms/transformer/FileThumbnailTransformer.java
+++ b/transformer/src/main/java/org/apache/sling/cms/transformer/FileThumbnailTransformer.java
@@ -21,7 +21,6 @@ import java.io.OutputStream;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.cms.File;
-import org.apache.sling.cms.transformer.OutputFileFormat;
/**
* Transforms a Sling File into thumbnails using the registered
diff --git a/transformer/src/main/java/org/apache/sling/cms/transformer/internal/TransformerWebConsole.java b/transformer/src/main/java/org/apache/sling/cms/transformer/internal/TransformerWebConsole.java
index 4fb47a6..185699b 100644
--- a/transformer/src/main/java/org/apache/sling/cms/transformer/internal/TransformerWebConsole.java
+++ b/transformer/src/main/java/org/apache/sling/cms/transformer/internal/TransformerWebConsole.java
@@ -84,9 +84,7 @@ public class TransformerWebConsole extends AbstractWebConsolePlugin {
pw.println("========================");
List<TransformationHandler> handlers = ((FileThumbnailTransformerImpl) fileThumbnailTransformer).getHandlers();
- handlers.forEach(h -> {
- pw.println(h.getClass().getName());
- });
+ handlers.forEach(h -> pw.println(h.getClass().getName()));
pw.println("</pre>");
pw.println("</div>");
}