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/05/28 19:27:33 UTC
[sling-org-apache-sling-app-cms] 03/08: More Commons Lang 3 Cleanup
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 553b3abeebcf7ca15935643ac6aaee472f6d8a1e
Author: Dan Klco <dk...@apache.org>
AuthorDate: Tue May 28 09:53:47 2019 -0400
More Commons Lang 3 Cleanup
---
reference/pom.xml | 4 +-
.../cms/reference/impl/SearchServiceImpl.java | 2 +-
.../sling/cms/reference/models/ItemList.java | 232 ++++++++++-----------
.../apache/sling/cms/reference/models/Search.java | 2 +-
4 files changed, 120 insertions(+), 120 deletions(-)
diff --git a/reference/pom.xml b/reference/pom.xml
index eb08d45..9bcecb2 100644
--- a/reference/pom.xml
+++ b/reference/pom.xml
@@ -107,8 +107,8 @@
<artifactId>org.apache.sling.models.api</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
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 f26922d..805a87f 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
@@ -18,7 +18,7 @@ package org.apache.sling.cms.reference.impl;
import java.util.Collections;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.ResourceResolver;
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 1bdacb5..68ee278 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
@@ -23,7 +23,7 @@ import java.util.*;
import javax.annotation.PostConstruct;
import javax.jcr.query.Query;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.Model;
@@ -38,126 +38,126 @@ 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(List.class);
- private int count;
+ private int count;
- private int end;
+ private int end;
- @RequestAttribute
- private String limit;
+ @RequestAttribute
+ private String limit;
- private int page;
-
- private Integer[] pages;
+ private int page;
+
+ private Integer[] pages;
- @RequestAttribute
- private String query;
+ @RequestAttribute
+ private String query;
- private SlingHttpServletRequest request;
+ private SlingHttpServletRequest request;
- private List<Resource> items = new ArrayList<>();
-
- private int start;
-
- public ItemList(SlingHttpServletRequest request) {
- this.request = request;
- }
-
- public int getCount() {
- return count;
- }
-
- public int getCurrentPage() {
- return page + 1;
- }
-
- public int getEnd() {
- return end;
- }
-
- public Integer[] getPages() {
- return pages;
- }
-
- public String getQuery() {
- return query;
- }
-
- public List<Resource> getItems() {
- return items;
- }
-
- public int getStart() {
- return start;
- }
-
- @PostConstruct
- public void init() {
-
- log.trace("init");
-
- Set<String> distinct = new HashSet<>();
-
- if (request.getRequestPathInfo().getSuffix() != null) {
- query = query.replace("{SUFFIX}", request.getRequestPathInfo().getSuffix());
- }
- log.debug("Listing results of: {}", query);
-
- Iterator<Resource> res = request.getResourceResolver().findResources(query, Query.JCR_SQL2);
- while (res.hasNext()) {
- Resource result = res.next();
- if (!distinct.contains(result.getPath())) {
- items.add(result);
- distinct.add(result.getPath());
- }
- }
- count = items.size();
- log.debug("Found {} results", count);
-
- if (StringUtils.isNotBlank(request.getParameter("page")) && request.getParameter("page").matches("\\d+")) {
- page = Integer.parseInt(request.getParameter("page"), 10) - 1;
- log.debug("Using page {}", page);
- } else {
- page = 0;
- log.debug("Page {} not specified or not valid", request.getParameter("page"));
- }
-
- int l = Integer.parseInt(this.limit, 10);
- if (page * l >= count) {
- start = count;
- } else {
- start = page * l;
- }
- log.debug("Using start {}", start);
-
- if ((page * l) + l >= count) {
- end = count;
- } else {
- end = (page * l) + l;
- }
- log.debug("Using end {}", end);
- items = items.subList(start, end);
-
- 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()]);
- if (log.isDebugEnabled()) {
- log.debug("Loaded pages {}", Arrays.toString(pages));
- }
- }
-
- public boolean isFirst() {
- return page == 0;
- }
-
- public boolean isLast() {
- if (pages.length > 0) {
- return page + 1 == pages[pages.length - 1];
- }
- return true;
- }
+ private List<Resource> items = new ArrayList<>();
+
+ private int start;
+
+ public ItemList(SlingHttpServletRequest request) {
+ this.request = request;
+ }
+
+ public int getCount() {
+ return count;
+ }
+
+ public int getCurrentPage() {
+ return page + 1;
+ }
+
+ public int getEnd() {
+ return end;
+ }
+
+ public Integer[] getPages() {
+ return pages;
+ }
+
+ public String getQuery() {
+ return query;
+ }
+
+ public List<Resource> getItems() {
+ return items;
+ }
+
+ public int getStart() {
+ return start;
+ }
+
+ @PostConstruct
+ public void init() {
+
+ log.trace("init");
+
+ Set<String> distinct = new HashSet<>();
+
+ if (request.getRequestPathInfo().getSuffix() != null) {
+ query = query.replace("{SUFFIX}", request.getRequestPathInfo().getSuffix());
+ }
+ log.debug("Listing results of: {}", query);
+
+ Iterator<Resource> res = request.getResourceResolver().findResources(query, Query.JCR_SQL2);
+ while (res.hasNext()) {
+ Resource result = res.next();
+ if (!distinct.contains(result.getPath())) {
+ items.add(result);
+ distinct.add(result.getPath());
+ }
+ }
+ count = items.size();
+ log.debug("Found {} results", count);
+
+ if (StringUtils.isNotBlank(request.getParameter("page")) && request.getParameter("page").matches("\\d+")) {
+ page = Integer.parseInt(request.getParameter("page"), 10) - 1;
+ log.debug("Using page {}", page);
+ } else {
+ page = 0;
+ log.debug("Page {} not specified or not valid", request.getParameter("page"));
+ }
+
+ int l = Integer.parseInt(this.limit, 10);
+ if (page * l >= count) {
+ start = count;
+ } else {
+ start = page * l;
+ }
+ log.debug("Using start {}", start);
+
+ if ((page * l) + l >= count) {
+ end = count;
+ } else {
+ end = (page * l) + l;
+ }
+ log.debug("Using end {}", end);
+ items = items.subList(start, end);
+
+ 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()]);
+ if (log.isDebugEnabled()) {
+ log.debug("Loaded pages {}", Arrays.toString(pages));
+ }
+ }
+
+ public boolean isFirst() {
+ return page == 0;
+ }
+
+ public boolean isLast() {
+ if (pages.length > 0) {
+ return page + 1 == pages[pages.length - 1];
+ }
+ return true;
+ }
}
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 7a7acc5..dc38a62 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
@@ -26,7 +26,7 @@ import java.util.Set;
import javax.annotation.PostConstruct;
import javax.jcr.query.Query;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.util.Text;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;