You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2022/09/09 13:51:55 UTC
[sling-org-apache-sling-engine] branch master updated (2c2f426 -> 1f959b1)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-engine.git
from 2c2f426 SLING-11569 do not enforce SlingHttpServletResponse to be an actual SlingHttpServletResponseImpl instance
new 7b15a21 cosmetic: remove unused imports
new 1f959b1 cosmetic: fix javadoc errors
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:
src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java | 1 -
.../org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java | 4 ++--
.../org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java | 1 -
.../org/apache/sling/engine/impl/parameters/ParameterSupport.java | 2 --
.../engine/benchmarks/AddValueToStatisticsViaExecutorDriver.java | 1 -
.../java/org/apache/sling/engine/impl/IncludeResponseWrapperTest.java | 3 +--
6 files changed, 3 insertions(+), 9 deletions(-)
[sling-org-apache-sling-engine] 01/02: cosmetic: remove unused imports
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-engine.git
commit 7b15a212c77a0ae196d29b9d763ec0f81691f494
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Fri Sep 9 15:50:25 2022 +0200
cosmetic: remove unused imports
---
src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java | 1 -
.../org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java | 2 +-
.../java/org/apache/sling/engine/impl/parameters/ParameterSupport.java | 2 --
.../sling/engine/benchmarks/AddValueToStatisticsViaExecutorDriver.java | 1 -
.../java/org/apache/sling/engine/impl/IncludeResponseWrapperTest.java | 3 +--
5 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java b/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
index 3bcbda1..0ea5aa6 100644
--- a/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
+++ b/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
@@ -21,7 +21,6 @@ package org.apache.sling.engine.impl;
import java.util.ArrayList;
import java.util.Dictionary;
import java.util.Hashtable;
-import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java b/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java
index 535f7bc..e53ffa6 100644
--- a/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java
+++ b/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java
@@ -24,7 +24,6 @@ import javax.servlet.ServletException;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.engine.impl.SlingMainServlet;
import org.apache.sling.engine.impl.SlingRequestProcessorImpl;
import org.apache.sling.engine.impl.filter.ServletFilterManager.FilterChainType;
@@ -43,6 +42,7 @@ public class RequestSlingFilterChain extends AbstractSlingFilterChain {
this.handler = handler;
}
+ @Override
protected void render(SlingHttpServletRequest request,
SlingHttpServletResponse response) throws ServletException,
IOException {
diff --git a/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java b/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
index ba48b89..07b5f5f 100644
--- a/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
+++ b/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
@@ -31,7 +31,6 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadException;
@@ -41,7 +40,6 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.fileupload.servlet.ServletRequestContext;
import org.apache.sling.api.request.RequestParameter;
import org.apache.sling.api.request.RequestParameterMap;
-import org.apache.sling.api.resource.ResourceResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/test/java/org/apache/sling/engine/benchmarks/AddValueToStatisticsViaExecutorDriver.java b/src/test/java/org/apache/sling/engine/benchmarks/AddValueToStatisticsViaExecutorDriver.java
index 12008fd..3b5cbd1 100644
--- a/src/test/java/org/apache/sling/engine/benchmarks/AddValueToStatisticsViaExecutorDriver.java
+++ b/src/test/java/org/apache/sling/engine/benchmarks/AddValueToStatisticsViaExecutorDriver.java
@@ -19,7 +19,6 @@ package org.apache.sling.engine.benchmarks;
import java.util.Random;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
import org.apache.commons.math.stat.descriptive.SynchronizedSummaryStatistics;
diff --git a/src/test/java/org/apache/sling/engine/impl/IncludeResponseWrapperTest.java b/src/test/java/org/apache/sling/engine/impl/IncludeResponseWrapperTest.java
index 39d39a7..efd5055 100644
--- a/src/test/java/org/apache/sling/engine/impl/IncludeResponseWrapperTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/IncludeResponseWrapperTest.java
@@ -24,7 +24,6 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.engine.impl.IncludeResponseWrapper;
import org.junit.Test;
import org.mockito.Mockito;
@@ -33,7 +32,7 @@ public class IncludeResponseWrapperTest {
@Test public void testReset() {
final SlingHttpServletResponse orig = Mockito.mock(SlingHttpServletResponse.class);
final HttpServletResponse include = new IncludeResponseWrapper(orig);
-
+
Mockito.when(orig.isCommitted()).thenReturn(false);
include.reset();
Mockito.verify(orig, times(1)).isCommitted();
[sling-org-apache-sling-engine] 02/02: cosmetic: fix javadoc errors
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-engine.git
commit 1f959b1d5ab16ee01928652fb00237521b939b84
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Fri Sep 9 15:51:47 2022 +0200
cosmetic: fix javadoc errors
---
.../org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java | 2 +-
.../org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java b/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java
index e53ffa6..f0ba43c 100644
--- a/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java
+++ b/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java
@@ -30,7 +30,7 @@ import org.apache.sling.engine.impl.filter.ServletFilterManager.FilterChainType;
/**
* The <code>RequestSlingFilterChain</code> implements the filter chain for
* request scoped filters. It is used by the
- * {@link SlingMainServlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)}
+ * {@link org.apache.sling.engine.impl.SlingMainServlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)}
* method to dispatch request processing.
*/
public class RequestSlingFilterChain extends AbstractSlingFilterChain {
diff --git a/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java b/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java
index 481ea04..f815926 100644
--- a/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java
+++ b/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java
@@ -47,7 +47,6 @@ public class SlingFilterChainHelper {
* @param order The order index
* @param orderSource The source for the order
* @param mbean MBean
- * @return
*/
public synchronized void addFilter(final Filter filter, FilterPredicate pattern,
final long filterId, final int order, final String orderSource, FilterProcessorMBeanImpl mbean) {