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:54 UTC
[sling-org-apache-sling-app-cms] 02/02: Fixing a number of minor
sonar qube issues
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>");
}