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 b2f71a5 Minor - cleanup of unused imports, adding encoding for the
query debugger and adding test coverage
b2f71a5 is described below
commit b2f71a5d466522ef62f3c427bac0f6c36677af35
Author: Dan Klco <[email protected]>
AuthorDate: Sun Jan 30 18:03:57 2022 -0500
Minor - cleanup of unused imports, adding encoding for the query debugger
and adding test coverage
---
.../core/insights/impl/PageInsightRequestImpl.java | 3 --
.../core/internal/filters/EditIncludeFilter.java | 1 -
.../servlets/CmsDefaultErrorHandlerServlet.java | 2 +-
.../sling/cms/core/helpers/SlingCMSTestHelper.java | 1 -
.../sling/cms/core/models/QueryDebuggerTest.java | 3 ++
.../reference/forms/impl/MockMessageBuilder.java | 1 -
.../components/cms/querydebug/querydebug.jsp | 32 +++++++++++++++-------
7 files changed, 26 insertions(+), 17 deletions(-)
diff --git
a/core/src/main/java/org/apache/sling/cms/core/insights/impl/PageInsightRequestImpl.java
b/core/src/main/java/org/apache/sling/cms/core/insights/impl/PageInsightRequestImpl.java
index 8d0edd9..97e011b 100644
---
a/core/src/main/java/org/apache/sling/cms/core/insights/impl/PageInsightRequestImpl.java
+++
b/core/src/main/java/org/apache/sling/cms/core/insights/impl/PageInsightRequestImpl.java
@@ -22,14 +22,11 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.security.NoSuchAlgorithmException;
-import java.util.HashMap;
-import java.util.Map;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.io.IOUtils;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.cms.Page;
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 423a495..e47c5e5 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
@@ -26,7 +26,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Optional;
-import java.util.ResourceBundle;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
diff --git
a/core/src/main/java/org/apache/sling/cms/core/internal/servlets/CmsDefaultErrorHandlerServlet.java
b/core/src/main/java/org/apache/sling/cms/core/internal/servlets/CmsDefaultErrorHandlerServlet.java
index 9a92ddf..5a8075c 100644
---
a/core/src/main/java/org/apache/sling/cms/core/internal/servlets/CmsDefaultErrorHandlerServlet.java
+++
b/core/src/main/java/org/apache/sling/cms/core/internal/servlets/CmsDefaultErrorHandlerServlet.java
@@ -138,7 +138,7 @@ public class CmsDefaultErrorHandlerServlet extends
SlingSafeMethodsServlet {
*/
public static final String SLING_CMS_ERROR_PATH =
"/static/sling-cms/errorhandling/";
- private final ResourceResolverFactory factory;
+ private final transient ResourceResolverFactory factory;
@Activate
public CmsDefaultErrorHandlerServlet(@Reference ResourceResolverFactory
factory) {
diff --git
a/core/src/test/java/org/apache/sling/cms/core/helpers/SlingCMSTestHelper.java
b/core/src/test/java/org/apache/sling/cms/core/helpers/SlingCMSTestHelper.java
index 2703365..2a0c5ea 100644
---
a/core/src/test/java/org/apache/sling/cms/core/helpers/SlingCMSTestHelper.java
+++
b/core/src/test/java/org/apache/sling/cms/core/helpers/SlingCMSTestHelper.java
@@ -44,7 +44,6 @@ import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.cms.ResourceTree;
-import org.apache.sling.cms.core.internal.filters.EditIncludeFilter;
import org.apache.sling.cms.i18n.I18NDictionary;
import org.apache.sling.cms.i18n.I18NProvider;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
diff --git
a/core/src/test/java/org/apache/sling/cms/core/models/QueryDebuggerTest.java
b/core/src/test/java/org/apache/sling/cms/core/models/QueryDebuggerTest.java
index 85a1159..c04f370 100644
--- a/core/src/test/java/org/apache/sling/cms/core/models/QueryDebuggerTest.java
+++ b/core/src/test/java/org/apache/sling/cms/core/models/QueryDebuggerTest.java
@@ -37,6 +37,9 @@ public class QueryDebuggerTest {
assertNull(debugger.getException());
assertNull(debugger.getPlan());
assertNull(debugger.getStatement());
+
+ assertNotNull(debugger.getPopularQueries());
+ assertNotNull(debugger.getSlowQueries());
}
@Test
diff --git
a/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/MockMessageBuilder.java
b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/MockMessageBuilder.java
index fa5aab8..17a7d1a 100644
---
a/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/MockMessageBuilder.java
+++
b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/MockMessageBuilder.java
@@ -20,7 +20,6 @@ import jakarta.mail.Header;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.AddressException;
import jakarta.mail.internet.InternetAddress;
-import jakarta.mail.internet.InternetHeaders;
import jakarta.mail.internet.MimeMessage;
import java.util.Collection;
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/querydebug/querydebug.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/querydebug/querydebug.jsp
index baa79c8..fe88692 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/querydebug/querydebug.jsp
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/querydebug/querydebug.jsp
@@ -37,23 +37,29 @@
<h2><fmt:message key="Popular Queries" /></h2>
<table class="table">
<tr>
- <th>
+ <th scope="col">
+ #
+ </th>
+ <th scope="col">
<fmt:message key="Query Statement" />
</th>
- <th>
+ <th scope="col">
<fmt:message key="Query Language" />
</th>
- <th>
+ <th scope="col">
<fmt:message key="Count" />
</th>
- <th>
+ <th scope="col">
<fmt:message key="Duration" />
</th>
</tr>
<c:forEach var="query" items="${queryDebugger.popularQueries}">
<tr>
<td>
- ${query.statement}
+ ${query.position}
+ </td>
+ <td>
+ ${fn:encode(query.statement,'HTML')}
</td>
<td>
${query.language}
@@ -70,23 +76,29 @@
<h2><fmt:message key="Slow Queries" /></h2>
<table class="table">
<tr>
- <th>
+ <th scope="col">
+ #
+ </th>
+ <th scope="col">
<fmt:message key="Query Statement" />
</th>
- <th>
+ <th scope="col">
<fmt:message key="Query Language" />
</th>
- <th>
+ <th scope="col">
<fmt:message key="Count" />
</th>
- <th>
+ <th scope="col">
<fmt:message key="Duration" />
</th>
</tr>
<c:forEach var="query" items="${queryDebugger.slowQueries}">
<tr>
<td>
- ${query.statement}
+ ${query.position}
+ </td>
+ <td>
+ ${fn:encode(query.statement,'HTML')}
</td>
<td>
${query.language}
