You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2020/04/14 08:13:05 UTC
[sling-org-apache-sling-scripting-bundle-tracker] branch master
updated: SLING-9364 - Implement lazy response writer
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker.git
The following commit(s) were added to refs/heads/master by this push:
new 6c5b2ed SLING-9364 - Implement lazy response writer
6c5b2ed is described below
commit 6c5b2edd51615ce4c9fdeab59dbbb81bebd9327e
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Tue Apr 14 10:13:00 2020 +0200
SLING-9364 - Implement lazy response writer
---
.../tracker/internal/BundledScriptServlet.java | 3 +-
.../tracker/internal/request/OnDemandReader.java | 18 ++--
.../tracker/internal/request/OnDemandWriter.java | 103 +++++++++++++++++++++
.../tracker/internal/request/ResponseWrapper.java | 50 ++++++++++
4 files changed, 164 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptServlet.java b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptServlet.java
index bcdad99..9628a51 100644
--- a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptServlet.java
+++ b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptServlet.java
@@ -34,6 +34,7 @@ import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.scripting.bundle.tracker.TypeProvider;
import org.apache.sling.scripting.bundle.tracker.internal.request.RequestWrapper;
+import org.apache.sling.scripting.bundle.tracker.internal.request.ResponseWrapper;
import org.jetbrains.annotations.NotNull;
class BundledScriptServlet extends GenericServlet {
@@ -71,7 +72,7 @@ class BundledScriptServlet extends GenericServlet {
wiredTypeProviders.stream().map(typeProvider -> typeProvider.getBundledRenderUnitCapability().getResourceTypes()
).flatMap(Collection::stream).collect(Collectors.toSet()));
ScriptContextProvider.ExecutableContext executableContext = scriptContextProvider
- .prepareScriptContext(requestWrapper, response, executable);
+ .prepareScriptContext(requestWrapper, new ResponseWrapper(response), executable);
try {
executableContext.eval();
} catch (ScriptException se) {
diff --git a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/request/OnDemandReader.java b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/request/OnDemandReader.java
index 3df25cf..7af2e7c 100644
--- a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/request/OnDemandReader.java
+++ b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/request/OnDemandReader.java
@@ -28,7 +28,7 @@ class OnDemandReader extends Reader {
private final ServletRequest request;
- private Reader delegatee;
+ private Reader delegate;
OnDemandReader(ServletRequest request) {
this.request = request;
@@ -36,8 +36,8 @@ class OnDemandReader extends Reader {
@Override
public void close() throws IOException {
- if (delegatee != null) {
- delegatee.close();
+ if (delegate != null) {
+ delegate.close();
}
}
@@ -48,7 +48,7 @@ class OnDemandReader extends Reader {
@Override
public boolean markSupported() {
- return (delegatee != null) ? delegatee.markSupported() : false;
+ return (delegate != null) && delegate.markSupported();
}
@Override
@@ -78,8 +78,8 @@ class OnDemandReader extends Reader {
@Override
public void reset() throws IOException {
- if (delegatee != null) {
- delegatee.reset();
+ if (delegate != null) {
+ delegate.reset();
}
}
@@ -89,9 +89,9 @@ class OnDemandReader extends Reader {
}
private Reader getReader() throws IOException {
- if (delegatee == null) {
- delegatee = request.getReader();
+ if (delegate == null) {
+ delegate = request.getReader();
}
- return delegatee;
+ return delegate;
}
}
diff --git a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/request/OnDemandWriter.java b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/request/OnDemandWriter.java
new file mode 100644
index 0000000..c26ebba
--- /dev/null
+++ b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/request/OnDemandWriter.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.scripting.bundle.tracker.internal.request;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.servlet.ServletResponse;
+
+class OnDemandWriter extends Writer {
+
+ private final ServletResponse response;
+
+ private Writer delegate;
+
+ OnDemandWriter(ServletResponse response) {
+ this.response = response;
+ }
+
+ private Writer getWriter() throws IOException {
+ if (delegate == null) {
+ delegate = response.getWriter();
+ }
+
+ return delegate;
+ }
+
+ @Override
+ public void write(int c) throws IOException {
+ synchronized (lock) {
+ getWriter().write(c);
+ }
+ }
+
+ @Override
+ public void write(char[] cbuf) throws IOException {
+ synchronized (lock) {
+ getWriter().write(cbuf);
+ }
+ }
+
+ @Override
+ public void write(char[] cbuf, int off, int len) throws IOException {
+ synchronized (lock) {
+ getWriter().write(cbuf, off, len);
+ }
+ }
+
+ @Override
+ public void write(String str) throws IOException {
+ synchronized (lock) {
+ getWriter().write(str);
+ }
+ }
+
+ @Override
+ public void write(String str, int off, int len) throws IOException {
+ synchronized (lock) {
+ getWriter().write(str, off, len);
+ }
+ }
+
+ @Override
+ public void flush() throws IOException {
+ synchronized (lock) {
+ Writer writer = delegate;
+ if (writer != null) {
+ writer.flush();
+ }
+ }
+ }
+
+ @Override
+ public void close() throws IOException {
+ synchronized (lock) {
+ // flush and close the delegate if existing, otherwise ignore
+ Writer writer = delegate;
+ if (writer != null) {
+ writer.flush();
+ writer.close();
+
+ // drop the delegate now
+ delegate = null;
+ }
+ }
+ }
+}
diff --git a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/request/ResponseWrapper.java b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/request/ResponseWrapper.java
new file mode 100644
index 0000000..88714ef
--- /dev/null
+++ b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/request/ResponseWrapper.java
@@ -0,0 +1,50 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package org.apache.sling.scripting.bundle.tracker.internal.request;
+
+import java.io.PrintWriter;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.wrappers.SlingHttpServletResponseWrapper;
+
+public class ResponseWrapper extends SlingHttpServletResponseWrapper {
+ private final AtomicReference<PrintWriter> writer = new AtomicReference<>();
+
+ /**
+ * Create a wrapper for the supplied wrappedRequest
+ *
+ * @param wrappedResponse The response
+ */
+ public ResponseWrapper(SlingHttpServletResponse wrappedResponse) {
+ super(wrappedResponse);
+ }
+
+ @Override
+ public PrintWriter getWriter() {
+ PrintWriter result = writer.get();
+ if (result == null) {
+ result = new PrintWriter(new OnDemandWriter(getResponse()));
+ if (!writer.compareAndSet(null, result)) {
+ result = writer.get();
+ }
+ }
+ return result;
+ }
+}