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 2018/09/05 18:12:11 UTC
[sling-org-apache-sling-app-cms] branch master updated: Fixing some
SonarQube 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
The following commit(s) were added to refs/heads/master by this push:
new bec3e99 Fixing some SonarQube issues
bec3e99 is described below
commit bec3e99f7bf13695830daa3c2772a919fd366f71
Author: Dan Klco <dk...@apache.org>
AuthorDate: Wed Sep 5 14:12:05 2018 -0400
Fixing some SonarQube issues
---
.../apache/sling/cms/reference/SearchService.java | 2 +-
.../cms/reference/impl/SearchServiceImpl.java | 2 +-
.../sling/cms/reference/models/ItemList.java | 22 ++++++++++++----------
.../apache/sling/cms/reference/models/Search.java | 10 ++++++----
4 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/reference/src/main/java/org/apache/sling/cms/reference/SearchService.java b/reference/src/main/java/org/apache/sling/cms/reference/SearchService.java
index 1261e4a..271f514 100644
--- a/reference/src/main/java/org/apache/sling/cms/reference/SearchService.java
+++ b/reference/src/main/java/org/apache/sling/cms/reference/SearchService.java
@@ -29,7 +29,7 @@ public interface SearchService {
*
* @param resolver the resource resolver used in search
*/
- void finalize(ResourceResolver resolver);
+ void closeResolver(ResourceResolver resolver);
/**
* Gets either the service user resource resolver of the request resource
diff --git a/reference/src/main/java/org/apache/sling/cms/reference/impl/SearchServiceImpl.java b/reference/src/main/java/org/apache/sling/cms/reference/impl/SearchServiceImpl.java
index 690d58a..d4212db 100644
--- a/reference/src/main/java/org/apache/sling/cms/reference/impl/SearchServiceImpl.java
+++ b/reference/src/main/java/org/apache/sling/cms/reference/impl/SearchServiceImpl.java
@@ -84,7 +84,7 @@ public class SearchServiceImpl implements SearchService {
}
@Override
- public void finalize(ResourceResolver resolver) {
+ public void closeResolver(ResourceResolver resolver) {
if (resolver != null && resolver.isLive() && StringUtils.isNotBlank(config.searchServiceUsername())
&& config.searchServiceUsername().equals(resolver.getUserID())) {
resolver.close();
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 231e298..1bdacb5 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
@@ -56,7 +56,7 @@ public class ItemList {
private SlingHttpServletRequest request;
- private List<Resource> items = new ArrayList<Resource>();
+ private List<Resource> items = new ArrayList<>();
private int start;
@@ -97,7 +97,7 @@ public class ItemList {
log.trace("init");
- Set<String> distinct = new HashSet<String>();
+ Set<String> distinct = new HashSet<>();
if (request.getRequestPathInfo().getSuffix() != null) {
query = query.replace("{SUFFIX}", request.getRequestPathInfo().getSuffix());
@@ -123,29 +123,31 @@ public class ItemList {
log.debug("Page {} not specified or not valid", request.getParameter("page"));
}
- int limit = Integer.parseInt(this.limit, 10);
- if (page * limit >= count) {
+ int l = Integer.parseInt(this.limit, 10);
+ if (page * l >= count) {
start = count;
} else {
- start = page * limit;
+ start = page * l;
}
log.debug("Using start {}", start);
- if ((page * limit) + limit >= count) {
+ if ((page * l) + l >= count) {
end = count;
} else {
- end = (page * limit) + limit;
+ end = (page * l) + l;
}
log.debug("Using end {}", end);
items = items.subList(start, end);
- List<Integer> pgs = new ArrayList<Integer>();
- int max = ((int) Math.ceil((double) count / limit)) + 1;
+ List<Integer> pgs = new ArrayList<>();
+ int max = ((int) Math.ceil((double) count / l)) + 1;
for (int i = 1; i < max; i++) {
pgs.add(i);
}
pages = pgs.toArray(new Integer[pgs.size()]);
- log.debug("Loaded pages {}", Arrays.toString(pages));
+ if (log.isDebugEnabled()) {
+ log.debug("Loaded pages {}", Arrays.toString(pages));
+ }
}
public boolean isFirst() {
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 cc6fdd9..5f2082f 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
@@ -109,7 +109,7 @@ public class Search {
@PostConstruct
public void init() {
- Set<String> distinct = new HashSet<String>();
+ Set<String> distinct = new HashSet<>();
String term = Text.escapeIllegalXpathSearchChars(request.getParameter(TERM_PARAMETER)).replaceAll("'", "''");
@@ -152,13 +152,15 @@ public class Search {
log.debug("Using end {}", end);
results = results.subList(start, end);
- List<Integer> pgs = new ArrayList<Integer>();
+ List<Integer> pgs = new ArrayList<>();
int max = ((int) Math.ceil((double) count / limit)) + 1;
for (int i = 1; i < max; i++) {
pgs.add(i);
}
pages = pgs.toArray(new Integer[pgs.size()]);
- log.debug("Loaded pages {}", Arrays.toString(pages));
+ if (log.isDebugEnabled()) {
+ log.debug("Loaded pages {}", Arrays.toString(pages));
+ }
}
/**
@@ -168,7 +170,7 @@ public class Search {
* @return true, always
*/
public String getFinalize() {
- searchService.finalize(resolver);
+ searchService.closeResolver(resolver);
return "";
}