You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2020/04/13 21:02:36 UTC

[sling-org-apache-sling-scripting-bundle-tracker] 01/01: SLING-9364: Implement lazy response writer

This is an automated email from the ASF dual-hosted git repository.

pauls pushed a commit to branch issues/SLING-9364
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker.git

commit a175e6a50af9aa5de696191afe18930121122137
Author: Karl Pauls <kp...@adobe.com>
AuthorDate: Mon Apr 13 23:02:19 2020 +0200

    SLING-9364: Implement lazy response writer
---
 .../tracker/internal/request/OnDemandWriter.java   | 103 +++++++++++++++++++++
 .../tracker/internal/request/RequestWrapper.java   |   4 +-
 .../tracker/internal/request/ResponseWrapper.java  |  47 ++++++++++
 3 files changed, 152 insertions(+), 2 deletions(-)

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..873f431
--- /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 delegatee;
+
+    OnDemandWriter(ServletResponse response) {
+        this.response = response;
+    }
+
+    private Writer getWriter() throws IOException {
+        if (delegatee == null) {
+            delegatee = response.getWriter();
+        }
+
+        return delegatee;
+    }
+
+    @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 = delegatee;
+            if (writer != null) {
+                writer.flush();
+            }
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        synchronized (lock) {
+            // flush and close the delegatee if existing, otherwise ignore
+            Writer writer = delegatee;
+            if (writer != null) {
+                writer.flush();
+                writer.close();
+
+                // drop the delegatee now
+                delegatee = null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/request/RequestWrapper.java b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/request/RequestWrapper.java
index 1039eec..6ce1b71 100644
--- a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/request/RequestWrapper.java
+++ b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/request/RequestWrapper.java
@@ -77,7 +77,7 @@ public class RequestWrapper extends SlingHttpServletRequestWrapper {
             requestDispatcherOptions.setAddSelectors(options.getAddSelectors());
             requestDispatcherOptions.setReplaceSelectors(options.getReplaceSelectors());
             requestDispatcherOptions.setReplaceSuffix(options.getReplaceSuffix());
-            String forcedResourceType = options.getForceResourceType();
+            /*String forcedResourceType = options.getForceResourceType();
             if (StringUtils.isNotEmpty(forcedResourceType)) {
                 for (ResourceType wiredResourceType : wiredResourceTypes) {
                     String type = wiredResourceType.getType();
@@ -86,7 +86,7 @@ public class RequestWrapper extends SlingHttpServletRequestWrapper {
                         break;
                     }
                 }
-            }
+            }*/
             return requestDispatcherOptions;
         }
         return 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..b4d31f4
--- /dev/null
+++ b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/request/ResponseWrapper.java
@@ -0,0 +1,47 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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 org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.wrappers.SlingHttpServletResponseWrapper;
+
+public class ResponseWrapper extends SlingHttpServletResponseWrapper
+{
+    private volatile PrintWriter writer;
+    /**
+     * Create a wrapper for the supplied wrappedRequest
+     *
+     * @param wrappedResponse The response
+     */
+    public ResponseWrapper(SlingHttpServletResponse wrappedResponse)
+    {
+        super(wrappedResponse);
+    }
+
+    @Override
+    public PrintWriter getWriter() {
+        if (writer == null) {
+            writer = new PrintWriter(new OnDemandWriter(getResponse()));
+        }
+
+        return writer;
+    }
+}